diff options
| -rw-r--r-- | core/java/android/os/UserManager.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/MountService.java | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index ddd16e21b066..16696af950bc 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -31,6 +31,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.storage.StorageManager; import android.provider.Settings; import android.util.Log; import android.view.WindowManager.LayoutParams; @@ -857,12 +858,10 @@ public class UserManager { /** {@hide} */ public boolean isUserUnlocked(int userId) { - try { - return ActivityManagerNative.getDefault().isUserRunning(userId, - ActivityManager.FLAG_AND_UNLOCKED); - } catch (RemoteException e) { - return false; - } + // TODO: eventually pivot this back to look at ActivityManager state, + // but there is race where we can start a non-encryption-aware launcher + // before that lifecycle has entered the running unlocked state. + return mContext.getSystemService(StorageManager.class).isUserKeyUnlocked(userId); } /** diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 184f8905acaf..487c273a69ee 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -3592,12 +3592,18 @@ class MountService extends IMountService.Stub } pw.println(); - pw.println("mConnection:"); + pw.println("mConnector:"); pw.increaseIndent(); mConnector.dump(fd, pw, args); pw.decreaseIndent(); pw.println(); + pw.println("mCryptConnector:"); + pw.increaseIndent(); + mCryptConnector.dump(fd, pw, args); + pw.decreaseIndent(); + + pw.println(); pw.print("Last maintenance: "); pw.println(TimeUtils.formatForLogging(mLastMaintenance)); } |