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

Apply package visibility to the getSyncAdapterPackages

Browse Source 
Bug: 184525389
Test: atest AppEnumerationTests
Test: atest AppStandbyControllerTests
Change-Id: I592c32c05b2276221c03ce751dd41a94a78d4b65
This commit is contained in:
Rhed Jao
2021-04-15 20:14:30 +08:00
parent c7469537d9
commit 1efdc1f4c0
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/content/ContentService.java
View File

@@ -807,12 +807,14 @@ public final class ContentService extends IContentService.Stub {
public String[] getSyncAdapterPackagesForAuthorityAsUser(String authority, int userId) {
enforceCrossUserPermission(userId,
"no permission to read sync settings for user " + userId);
final int callingUid = Binder.getCallingUid();
// This makes it so that future permission checks will be in the context of this
// process rather than the caller's process. We will restore this before returning.
final long identityToken = clearCallingIdentity();
try {
SyncManager syncManager = getSyncManager();
return syncManager.getSyncAdapterPackagesForAuthorityAsUser(authority, userId);
return syncManager.getSyncAdapterPackagesForAuthorityAsUser(authority, callingUid,
userId);
} finally {
restoreCallingIdentity(identityToken);
}

15
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -1261,8 +1261,19 @@ public class SyncManager {
return types.toArray(new SyncAdapterType[] {});
}
public String[] getSyncAdapterPackagesForAuthorityAsUser(String authority, int userId) {
return mSyncAdapters.getSyncAdapterPackagesForAuthority(authority, userId);
public String[] getSyncAdapterPackagesForAuthorityAsUser(String authority, int callingUid,
int userId) {
final String[] syncAdapterPackages = mSyncAdapters.getSyncAdapterPackagesForAuthority(
authority, userId);
final List<String> filteredResult = new ArrayList<>(syncAdapterPackages.length);
for (String packageName : syncAdapterPackages) {
if (TextUtils.isEmpty(packageName) || mPackageManagerInternal.filterAppAccess(
packageName, callingUid, userId)) {
continue;
}
filteredResult.add(packageName);
}
return filteredResult.toArray(new String[] {});
}
private void sendSyncFinishedOrCanceledMessage(ActiveSyncContext syncContext,