Workaround SecurityException in FS#getFsTimestampResolution

On Android FS#getFsTimestampResolution always throws a
SecurityException, handle this by falling back to the fallback timestamp
resolution.

Bug: 548947
Change-Id: I0ee6cb3c20e189bdc8d488434a930427ad6f2df2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index a970a7df23adfae9800641431fc01edcb1f727ec..6e3e336e94264c1b4b22ed381bfe2d04cba8a038 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -281,7 +281,7 @@ public abstract class FS {
                        } catch (IOException | InterruptedException
                                        | ExecutionException e) {
                                LOG.error(e.getMessage(), e);
-                       } catch (TimeoutException e) {
+                       } catch (TimeoutException | SecurityException e) {
                                // use fallback
                        }
                        return FALLBACK_TIMESTAMP_RESOLUTION;