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

Merge "Early exit when target app ID < FIRST_APP_UID" into rvc-dev am: d65f6e8fb4 am: bdefa4dfeb am: 756914eb10

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

Change-Id: I8b83548ccd2ee7b10b375f654e38f0d9ac395508
This commit is contained in:
TreeHugger Robot
2020-06-18 06:14:28 +00:00
committed by Automerger Merge Worker
parent 49e5807f9b 756914eb10
commit 713dbdafcf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -861,6 +861,7 @@ public class AppsFilter {
try {
int callingAppId = UserHandle.getAppId(callingUid);
if (callingAppId < Process.FIRST_APPLICATION_UID
|| targetPkgSetting.appId < Process.FIRST_APPLICATION_UID
|| callingAppId == targetPkgSetting.appId) {
return false;
}

3
services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java
View File

@@ -806,7 +806,8 @@ public class AppsFilterTest {
final SparseArray<int[]> systemFilter =
appsFilter.getVisibilityWhitelist(system, USER_ARRAY, mExisting);
assertThat(toList(systemFilter.get(SYSTEM_USER)), empty());
assertThat(toList(systemFilter.get(SYSTEM_USER)),
contains(seesNothingAppId, hasProviderAppId, queriesProviderAppId));
final SparseArray<int[]> seesNothingFilter =
appsFilter.getVisibilityWhitelist(seesNothing, USER_ARRAY, mExisting);