Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84d2232c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] do not check @Readable for system/priv apps in the... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c39897c99b21b21ea3108bb84a13325777a4ec9
parents f23fed59 7ddd1bd4

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+4 −1
Original line number Diff line number Diff line
@@ -1937,8 +1937,11 @@ public class SettingsProvider extends ContentProvider { 
        if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {

            return;

        }

        checkReadableAnnotation(settingsType, settingName);

        ApplicationInfo ai = getCallingApplicationInfoOrThrow();

        if (ai.isSystemApp() || ai.isSignedWithPlatformKey()) {

            return;

        }

        checkReadableAnnotation(settingsType, settingName);

        if (!ai.isInstantApp()) {

            return;

        }