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

Merge "[SettingsProvider] do not check @Readable for system/priv apps in the server" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-11 20:17:56 +00:00
committed by Android (Google) Code Review
parent 0ec8d259d5 403d4ee851
commit 7ddd1bd457
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -1937,8 +1937,11 @@ public class SettingsProvider extends ContentProvider {
if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) { if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
return; return;
} }
checkReadableAnnotation(settingsType, settingName);
ApplicationInfo ai = getCallingApplicationInfoOrThrow(); ApplicationInfo ai = getCallingApplicationInfoOrThrow();
if (ai.isSystemApp() || ai.isSignedWithPlatformKey()) {
return;
}
checkReadableAnnotation(settingsType, settingName);
if (!ai.isInstantApp()) { if (!ai.isInstantApp()) {
return; return;
} }