Merge "Better file permissions enforcement on system keystore."

1 files changed, 3 insertions, 0 deletions

diff --git a/keystore/java/android/security/SystemKeyStore.java b/keystore/java/android/security/SystemKeyStore.java
index 61a4293..abdb0ae 100644
--- a/keystore/java/android/security/SystemKeyStore.java
+++ b/keystore/java/android/security/SystemKeyStore.java
@@ -17,6 +17,7 @@
 package android.security;
 
 import android.os.Environment;
+import android.os.FileUtils;
 import android.os.Process;
 
 import java.io.File;
@@ -92,6 +93,8 @@ public class SystemKeyStore {
             fos.write(retKey);
             fos.flush();
             fos.close();
+            FileUtils.setPermissions(keyFile.getName(), (FileUtils.S_IRUSR | FileUtils.S_IWUSR),
+                -1, -1);
         } catch (IOException ioe) {
             return null;
         }