Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8ac43ed authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "StorageManagerService: use correct user when checking isDeviceSecure()."

parents 62e997ff 7c1df2d1

services/core/java/com/android/server/StorageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {