diff options
| author | 2020-01-07 11:32:29 +0000 | |
|---|---|---|
| committer | 2020-01-07 11:32:29 +0000 | |
| commit | f8ac43edaba35e0d5616f55a2de607216cbb84e7 (patch) | |
| tree | e2d1b3e7af6075ec0c462e2377e78f3e899c311d | |
| parent | 62e997ff4f4b13473be19c6cd7f6f008d86f09aa (diff) | |
| parent | 7c1df2d120faecb728c1ff405957a38d5141a8d3 (diff) | |
Merge "StorageManagerService: use correct user when checking isDeviceSecure()."
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 18ccd01436a8..3d455ee1cf19 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1119,7 +1119,7 @@ class StorageManagerService extends IStorageManager.Stub // Push down current secure keyguard status so that we ignore malicious // USB devices while locked. mSecureKeyguardShowing = isShowing - && mContext.getSystemService(KeyguardManager.class).isDeviceSecure(); + && mContext.getSystemService(KeyguardManager.class).isDeviceSecure(mCurrentUserId); try { mVold.onSecureKeyguardStateChanged(mSecureKeyguardShowing); } catch (Exception e) { |