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 am: 6975b68d32

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

Change-Id: I52b85bf83c0d8b1c4b52d9b40e9057777d66c2a4
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:47:19 +00:00
committed by Automerger Merge Worker
parent 4db1d7ea8a 6975b68d32
commit 8b1496df2e
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_VOLUME_STATE_CHANGED = 15;
private static final int H_CLOUD_MEDIA_PROVIDER_CHANGED = 16;
private static final int H_SECURE_KEYGUARD_STATE_CHANGED = 17;
class StorageManagerServiceHandler extends Handler {
public StorageManagerServiceHandler(Looper looper) {
@@ -871,6 +872,14 @@ class StorageManagerService extends IStorageManager.Stub
}
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) {
// Push down current secure keyguard status so that we ignore malicious
// USB devices while locked.
mSecureKeyguardShowing = isShowing
boolean isSecureKeyguardShowing = isShowing
&& mContext.getSystemService(KeyguardManager.class).isDeviceSecure(mCurrentUserId);
try {
mVold.onSecureKeyguardStateChanged(mSecureKeyguardShowing);
} catch (Exception e) {
Slog.wtf(TAG, e);
if (mSecureKeyguardShowing != isSecureKeyguardShowing) {
mSecureKeyguardShowing = isSecureKeyguardShowing;
mHandler.obtainMessage(H_SECURE_KEYGUARD_STATE_CHANGED, mSecureKeyguardShowing)
.sendToTarget();
}
}