commit e19dcaa50f1a74d0151891826402b2802b6526ea
author Clara Bayarri <clarabayarri@google.com> Mon Nov 02 10:31:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 02 10:31:58 2015 +0000
tree 899a652fc239e7770fc29791d99804fac9cd331d
parent 6de8a0e51f0cf8c52a4de672d4b2d8f2d78d143e
parent f05b9d0830ab7fd1ba4da8801194353889919ffc

Merge "Return actual userId when File Based Encryption is present"

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 4dd7388..5d0e83d 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -45,6 +45,7 @@
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.UserManagerInternal;
@@ -150,11 +151,6 @@
     // without first making sure that the rest of the framework is prepared for it.
     private static final int MAX_MANAGED_PROFILES = 1;
 
-    /**
-     * Flag indicating whether device credentials are shared among same-user profiles.
-     */
-    private static final boolean CONFIG_PROFILES_SHARE_CREDENTIAL = true;
-
     static final int WRITE_USER_MSG = 1;
     static final int WRITE_USER_DELAY = 2*1000;  // 2 seconds
 
@@ -390,7 +386,7 @@
     @Override
     public int getCredentialOwnerProfile(int userHandle) {
         checkManageUsersPermission("get the credential owner");
-        if (CONFIG_PROFILES_SHARE_CREDENTIAL) {
+        if (!"file".equals(SystemProperties.get("ro.crypto.type", "none"))) {
             synchronized (mPackagesLock) {
                 UserInfo profileParent = getProfileParentLocked(userHandle);
                 if (profileParent != null) {