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

Commit 596437fd authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Added a new set of permissions for DeviceConfig API. 

Permissions READ_DEVICE_CONFIG and WRITE_DEVICE_CONFIG are required to
use DeviceConfig API. Actual checks for new permissions are not added
as we are waiting for gmscore to include them into manifest.

Also added "configurator" protection flag.

Test: atest FrameworksCoreTests:DeviceConfigTest
      atest FrameworksCoreTests:SettingsProviderTest
      atest SettingsProviderTest:DeviceConfigServiceTest
Bug:109919982
Bug:113100523
Bug:113101834
Bug:117663715
Change-Id: I66c256b57c5491201c6c7834620a287b6c81c23c
parent 64e9cd30

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ package android { 
    field public static final java.lang.String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";

    field public static final java.lang.String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";

    field public static final java.lang.String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";

    field public static final java.lang.String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE";

    field public static final java.lang.String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";

    field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY";
@@ -182,6 +183,7 @@ package android { 
    field public static final java.lang.String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES";

    field public static final java.lang.String USER_ACTIVITY = "android.permission.USER_ACTIVITY";

    field public static final java.lang.String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";

    field public static final java.lang.String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";

    field public static final java.lang.String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE";

    field public static final java.lang.String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS";

    field public static final java.lang.String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
@@ -1347,6 +1349,7 @@ package android.content.pm { 


  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int FLAG_REMOVED = 2; // 0x2

    field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000

    field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ package android.content.pm { 
  }



  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000

    field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

core/java/android/content/pm/PackageManagerInternal.java

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public abstract class PackageManagerInternal { 
    public static final int PACKAGE_PERMISSION_CONTROLLER = 6;

    public static final int PACKAGE_WELLBEING = 7;

    public static final int PACKAGE_DOCUMENTER = 8;

    public static final int PACKAGE_CONFIGURATOR = 9;

    @IntDef(value = {

        PACKAGE_SYSTEM,

        PACKAGE_SETUP_WIZARD,
@@ -65,6 +66,7 @@ public abstract class PackageManagerInternal { 
        PACKAGE_PERMISSION_CONTROLLER,

        PACKAGE_WELLBEING,

        PACKAGE_DOCUMENTER,

        PACKAGE_CONFIGURATOR,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface KnownPackage {}

core/java/android/content/pm/PermissionInfo.java

+14 −0
Original line number Diff line number Diff line
@@ -202,6 +202,16 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
    @TestApi

    public static final int PROTECTION_FLAG_DOCUMENTER = 0x40000;



    /**

     * Additional flag for {@link #protectionLevel}, corresponding to the

     * {@code configurator} value of {@link android.R.attr#protectionLevel}.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int PROTECTION_FLAG_CONFIGURATOR = 0x80000;





    /** @hide */

    @IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {
@@ -221,6 +231,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
            PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER,

            PROTECTION_FLAG_WELLBEING,

            PROTECTION_FLAG_DOCUMENTER,

            PROTECTION_FLAG_CONFIGURATOR,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProtectionFlags {}
@@ -416,6 +427,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        if ((level & PermissionInfo.PROTECTION_FLAG_DOCUMENTER) != 0) {

            protLevel += "|documenter";

        }

        if ((level & PROTECTION_FLAG_CONFIGURATOR) != 0) {

            protLevel += "|configurator";

        }

        return protLevel;

    }

core/java/android/provider/DeviceConfig.java

+9 −0
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


package android.provider;



import static android.Manifest.permission.READ_DEVICE_CONFIG;

import static android.Manifest.permission.WRITE_DEVICE_CONFIG;



import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.app.ActivityThread;

import android.content.ContentResolver;
@@ -69,6 +73,7 @@ public final class DeviceConfig { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(READ_DEVICE_CONFIG)

    public static String getProperty(String namespace, String name) {

        ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();

        String compositeName = createCompositeName(namespace, name);
@@ -96,6 +101,7 @@ public final class DeviceConfig { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(WRITE_DEVICE_CONFIG)

    public static boolean setProperty(

            String namespace, String name, String value, boolean makeDefault) {

        ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();
@@ -116,6 +122,7 @@ public final class DeviceConfig { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(WRITE_DEVICE_CONFIG)

    public static void resetToDefaults(@ResetMode int resetMode, @Nullable String namespace) {

        ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();

        Settings.Config.resetToDefaults(contentResolver, resetMode, namespace);
@@ -137,10 +144,12 @@ public final class DeviceConfig { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(READ_DEVICE_CONFIG)

    public static void addOnPropertyChangedListener(

            @NonNull String namespace,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OnPropertyChangedListener onPropertyChangedListener) {

        // TODO enforce READ_DEVICE_CONFIG permission

        synchronized (sLock) {

            Pair<String, Executor> oldNamespace = sListeners.get(onPropertyChangedListener);

            if (oldNamespace == null) {