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 am: a3aa00e29c

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

Change-Id: I7b9886f3dc7c3faae8c6fbf587af89b7258a33d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-06-15 21:08:29 +00:00
committed by Automerger Merge Worker
parent c907c02a72 a3aa00e29c
commit e6bfe7de90
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)
&& mPermissionManager.getHotwordDetectionServiceProvider() != null
&& 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 appId = UserHandle.getAppId(uid);
@@ -4352,7 +4357,12 @@ public class ComputerEngine implements Computer {
if (Process.isIsolatedUid(uid)
&& mPermissionManager.getHotwordDetectionServiceProvider() != null
&& 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 Object obj = mSettings.getSettingBase(appId);