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

Merge "[pm] fix crash caused by race condition onUidGone" into udc-dev

Browse Source
This commit is contained in:
Song Chun Fan
2023-06-15 20:33:20 +00:00
committed by Android (Google) Code Review
parent dea20a433c 152db1f9dc
commit a3aa00e29c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/pm/ComputerEngine.java
View File

@@ -4311,7 +4311,12 @@ public class ComputerEngine implements Computer {
if (Process.isIsolatedUid(uid) if (Process.isIsolatedUid(uid)
&& mPermissionManager.getHotwordDetectionServiceProvider() != null && mPermissionManager.getHotwordDetectionServiceProvider() != null
&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) { && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
uid = getIsolatedOwner(uid); try {
uid = getIsolatedOwner(uid);
} catch (IllegalStateException e) {
// If the owner uid doesn't exist, just use the current uid
Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e);
}
} }
final int callingUserId = UserHandle.getUserId(callingUid); final int callingUserId = UserHandle.getUserId(callingUid);
final int appId = UserHandle.getAppId(uid); final int appId = UserHandle.getAppId(uid);
@@ -4352,7 +4357,12 @@ public class ComputerEngine implements Computer {
if (Process.isIsolatedUid(uid) if (Process.isIsolatedUid(uid)
&& mPermissionManager.getHotwordDetectionServiceProvider() != null && mPermissionManager.getHotwordDetectionServiceProvider() != null
&& uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) { && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {
uid = getIsolatedOwner(uid); try {
uid = getIsolatedOwner(uid);
} catch (IllegalStateException e) {
// If the owner uid doesn't exist, just use the current uid
Slog.wtf(TAG, "Expected isolated uid " + uid + " to have an owner", e);
}
} }
final int appId = UserHandle.getAppId(uid); final int appId = UserHandle.getAppId(uid);
final Object obj = mSettings.getSettingBase(appId); final Object obj = mSettings.getSettingBase(appId);