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

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

Change-Id: I0643ca389360b084b47de78b3b2783bcdb59b938
This commit is contained in:
TreeHugger Robot
2020-06-18 06:00:54 +00:00
committed by Automerger Merge Worker
parent 8b74c3624c bdefa4dfeb
commit 756914eb10
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 { try {
int callingAppId = UserHandle.getAppId(callingUid); int callingAppId = UserHandle.getAppId(callingUid);
if (callingAppId < Process.FIRST_APPLICATION_UID if (callingAppId < Process.FIRST_APPLICATION_UID
|| targetPkgSetting.appId < Process.FIRST_APPLICATION_UID
|| callingAppId == targetPkgSetting.appId) { || callingAppId == targetPkgSetting.appId) {
return false; 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 = final SparseArray<int[]> systemFilter =
appsFilter.getVisibilityWhitelist(system, USER_ARRAY, mExisting); 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 = final SparseArray<int[]> seesNothingFilter =
appsFilter.getVisibilityWhitelist(seesNothing, USER_ARRAY, mExisting); appsFilter.getVisibilityWhitelist(seesNothing, USER_ARRAY, mExisting);