Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move "mVold.onSecureKeyguardStateChanged" to handler thread" am: f552cf824c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2264805

Change-Id: I0e0efdd5180b373a7acf965de0d34b2db7d51f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-07 22:30:38 +00:00
committed by Automerger Merge Worker
parent 373bd79698 f552cf824c
commit 6975b68d32
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -732,6 +732,7 @@ class StorageManagerService extends IStorageManager.Stub
private static final int H_COMPLETE_UNLOCK_USER = 14; private static final int H_COMPLETE_UNLOCK_USER = 14;
private static final int H_VOLUME_STATE_CHANGED = 15; private static final int H_VOLUME_STATE_CHANGED = 15;
private static final int H_CLOUD_MEDIA_PROVIDER_CHANGED = 16; private static final int H_CLOUD_MEDIA_PROVIDER_CHANGED = 16;
private static final int H_SECURE_KEYGUARD_STATE_CHANGED = 17;
class StorageManagerServiceHandler extends Handler { class StorageManagerServiceHandler extends Handler {
public StorageManagerServiceHandler(Looper looper) { public StorageManagerServiceHandler(Looper looper) {
@@ -871,6 +872,14 @@ class StorageManagerService extends IStorageManager.Stub
} }
break; break;
} }
case H_SECURE_KEYGUARD_STATE_CHANGED: {
try {
mVold.onSecureKeyguardStateChanged((boolean) msg.obj);
} catch (Exception e) {
Slog.wtf(TAG, e);
}
break;
}
} }
} }
} }
@@ -1330,12 +1339,12 @@ class StorageManagerService extends IStorageManager.Stub
public void onKeyguardStateChanged(boolean isShowing) { public void onKeyguardStateChanged(boolean isShowing) {
// Push down current secure keyguard status so that we ignore malicious // Push down current secure keyguard status so that we ignore malicious
// USB devices while locked. // USB devices while locked.
mSecureKeyguardShowing = isShowing boolean isSecureKeyguardShowing = isShowing
&& mContext.getSystemService(KeyguardManager.class).isDeviceSecure(mCurrentUserId); && mContext.getSystemService(KeyguardManager.class).isDeviceSecure(mCurrentUserId);
try { if (mSecureKeyguardShowing != isSecureKeyguardShowing) {
mVold.onSecureKeyguardStateChanged(mSecureKeyguardShowing); mSecureKeyguardShowing = isSecureKeyguardShowing;
} catch (Exception e) { mHandler.obtainMessage(H_SECURE_KEYGUARD_STATE_CHANGED, mSecureKeyguardShowing)
Slog.wtf(TAG, e); .sendToTarget();
} }
} }