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

Commit a8aa6d83 authored by Tom Natan's avatar Tom Natan Committed by Automerger Merge Worker
Browse files

Merge "Add constant for "app_compat_overrides" namespace" into sc-v2-dev am:... 

Merge "Add constant for "app_compat_overrides" namespace" into sc-v2-dev am: 1920a823 am: 9c858311

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

Change-Id: I64715708c104eb1ee5fe3df880e21c4539836a95
parents 40797d6f 9c858311

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2126,6 +2126,7 @@ package android.provider { 
  public final class DeviceConfig {

    field public static final String NAMESPACE_ALARM_MANAGER = "alarm_manager";

    field public static final String NAMESPACE_ANDROID = "android";

    field public static final String NAMESPACE_APP_COMPAT_OVERRIDES = "app_compat_overrides";

    field public static final String NAMESPACE_CONSTRAIN_DISPLAY_APIS = "constrain_display_apis";

    field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";

    field public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -606,6 +606,14 @@ public final class DeviceConfig { 
    @TestApi

    public static final String NAMESPACE_CONSTRAIN_DISPLAY_APIS = "constrain_display_apis";



    /**

     * Namespace for App Compat Overrides related features.

     *

     * @hide

     */

    @TestApi

    public static final String NAMESPACE_APP_COMPAT_OVERRIDES = "app_compat_overrides";



    private static final Object sLock = new Object();

    @GuardedBy("sLock")

    private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =