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

Commit b6100c1b authored by Biswarup Pal's avatar Biswarup Pal Committed by Android (Google) Code Review
Browse files

Merge "Return default device settings from ActivityThread for no override" into main

parents 48be88fb 7028d319

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3079,6 +3079,8 @@ package android.provider { 
    field public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";

    field public static final String GLANCEABLE_HUB_ENABLED = "glanceable_hub_enabled";

    field public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations";

    field public static final String LONG_PRESS_TIMEOUT = "long_press_timeout";

    field public static final String MULTI_PRESS_TIMEOUT = "multi_press_timeout";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content";

core/java/android/app/ActivityThread.java

+7 −1
Original line number Diff line number Diff line
@@ -9031,7 +9031,13 @@ public final class ActivityThread extends ClientTransactionHandler 


    private Bundle getCoreSettingsForDeviceLocked(int deviceId) {

        if (android.companion.virtualdevice.flags.Flags.deviceAwareSettingsOverride()) {

            return mCoreSettings.getBundle(String.valueOf(deviceId));

            Bundle bundle = mCoreSettings.getBundle(String.valueOf(deviceId));

            if (deviceId != Context.DEVICE_ID_DEFAULT && bundle == null) {

                // There hasn't been any overridden settings for the virtual device, so just return

                // the settings for the default device.

                bundle = mCoreSettings.getBundle(String.valueOf(Context.DEVICE_ID_DEFAULT));

            }

            return bundle;

        }

        return mCoreSettings;

    }

core/java/android/provider/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -9601,6 +9601,8 @@ public final class Settings { 
         */

        @UnsupportedAppUsage

        @Readable

        @TestApi

        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.

        public static final String LONG_PRESS_TIMEOUT = "long_press_timeout";















        /**









@@ -9609,6 +9611,8 @@ public final class Settings {













         * @hide















         */















        @Readable













        @TestApi













        @SuppressLint({"UnflaggedApi", "NoSettingsProvider"}) // @TestApi purely for CTS support.















        public static final String MULTI_PRESS_TIMEOUT = "multi_press_timeout";





























        /**