Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev

2017-07-27 02:58:43 +00:00
parent 8a3ccb11a0 9139a78d3d
commit f43054df6b
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2955,6 +2955,11 @@ class StorageManagerService extends IStorageManager.Stub
        synchronized (mLock) {
            mLocalUnlockedUsers = ArrayUtils.appendInt(mLocalUnlockedUsers, userId);
        }
+        if (userId == UserHandle.USER_SYSTEM) {
+            String propertyName = "sys.user." + userId + ".ce_available";
+            Slog.d(TAG, "Setting property: " + propertyName + "=true");
+            SystemProperties.set(propertyName, "true");
+        }
    }

    @Override