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

Commit 403d4ee8 authored by Songchun Fan's avatar Songchun Fan
Browse files

[SettingsProvider] do not check @Readable for system/priv apps in the server 

We already have this check on the client side. Copying it over to the
server side for cases when the server side is called directly.

BUG: 175024829
Test: atest com.android.devicehealthchecks.SystemAppCheck#system_app_crash
Change-Id: Ib540b9bdb29343eec79a2f31e0b26fe333117395
parent 167dea12

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;

        }