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

Commit 4541eb47 authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Introduce FLAG_UNSUPPORTED_WHEN_POWER_SAVE_MODE" into udc-dev am: d8cb6e2c am: 8b4c292f 

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



Change-Id: Idad293ffbe3185ac3a3ed007bcfe9d56a7a390c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8307cea1 8b4c292f

core/res/res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,12 @@ 
    <string-array name="device_state_notification_thermal_contents">

        <item>@string/concurrent_display_notification_thermal_content</item>

    </string-array>

    <string-array name="device_state_notification_power_save_titles">

        <item>@string/concurrent_display_notification_power_save_title</item>

    </string-array>

    <string-array name="device_state_notification_power_save_contents">

        <item>@string/concurrent_display_notification_power_save_content</item>

    </string-array>



    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner of the

         demo device provisioning permissions. -->

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -6267,6 +6267,12 @@ ul.</string> 
    <string name="concurrent_display_notification_thermal_title">Device is too warm</string>

    <!-- Content of concurrent display thermal notification. [CHAR LIMIT=NONE] -->

    <string name="concurrent_display_notification_thermal_content">Dual Screen is unavailable because your phone is getting too warm</string>

    <!-- Title of concurrent display power saver notification. [CHAR LIMIT=NONE] -->

    <string name="concurrent_display_notification_power_save_title">Dual Screen is unavailable</string>

    <!-- Content of concurrent display power saver notification. [CHAR LIMIT=NONE] -->

    <string name="concurrent_display_notification_power_save_content">Dual Screen is unavailable because Battery Saver is on. You can turn this off in Settings.</string>

    <!-- Text of power saver notification settings button. [CHAR LIMIT=NONE] -->

    <string name="device_state_notification_settings_button">Go to Settings</string>

    <!-- Text of device state notification turn off button. [CHAR LIMIT=NONE] -->

    <string name="device_state_notification_turn_off_button">Turn off</string>

core/res/res/values/symbols.xml

+5 −0
Original line number Diff line number Diff line
@@ -4931,12 +4931,17 @@ 
  <java-symbol type="array" name="device_state_notification_active_contents"/>

  <java-symbol type="array" name="device_state_notification_thermal_titles"/>

  <java-symbol type="array" name="device_state_notification_thermal_contents"/>

  <java-symbol type="array" name="device_state_notification_power_save_titles"/>

  <java-symbol type="array" name="device_state_notification_power_save_contents"/>

  <java-symbol type="string" name="concurrent_display_notification_name"/>

  <java-symbol type="string" name="concurrent_display_notification_active_title"/>

  <java-symbol type="string" name="concurrent_display_notification_active_content"/>

  <java-symbol type="string" name="concurrent_display_notification_thermal_title"/>

  <java-symbol type="string" name="concurrent_display_notification_thermal_content"/>

  <java-symbol type="string" name="concurrent_display_notification_power_save_title"/>

  <java-symbol type="string" name="concurrent_display_notification_power_save_content"/>

  <java-symbol type="string" name="device_state_notification_turn_off_button"/>

  <java-symbol type="string" name="device_state_notification_settings_button"/>

  <java-symbol type="bool" name="config_independentLockscreenLiveWallpaper"/>

  <java-symbol type="integer" name="config_deviceStateConcurrentRearDisplay" />

  <java-symbol type="string" name="config_rearDisplayPhysicalAddress" />

services/core/java/com/android/server/devicestate/DeviceState.java

+9 −2
Original line number Diff line number Diff line
@@ -76,7 +76,13 @@ public final class DeviceState { 
     * This flag indicates that the corresponding state should be disabled when the device is

     * overheating and reaching the critical status.

     */

    public static final int FLAG_DISABLE_WHEN_THERMAL_STATUS_CRITICAL = 1 << 4;

    public static final int FLAG_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL = 1 << 4;



    /**

     * This flag indicates that the corresponding state should be disabled when power save mode

     * is enabled.

     */

    public static final int FLAG_UNSUPPORTED_WHEN_POWER_SAVE_MODE = 1 << 5;



    /** @hide */

    @IntDef(prefix = {"FLAG_"}, flag = true, value = {
@@ -84,7 +90,8 @@ public final class DeviceState { 
            FLAG_APP_INACCESSIBLE,

            FLAG_EMULATED_ONLY,

            FLAG_CANCEL_WHEN_REQUESTER_NOT_ON_TOP,

            FLAG_DISABLE_WHEN_THERMAL_STATUS_CRITICAL

            FLAG_UNSUPPORTED_WHEN_THERMAL_STATUS_CRITICAL,

            FLAG_UNSUPPORTED_WHEN_POWER_SAVE_MODE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface DeviceStateFlags {}

services/core/java/com/android/server/devicestate/DeviceStateManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STA 
import static com.android.server.devicestate.DeviceState.FLAG_CANCEL_OVERRIDE_REQUESTS;

import static com.android.server.devicestate.OverrideRequest.OVERRIDE_REQUEST_TYPE_BASE_STATE;

import static com.android.server.devicestate.OverrideRequest.OVERRIDE_REQUEST_TYPE_EMULATED_STATE;

import static com.android.server.devicestate.OverrideRequestController.FLAG_POWER_SAVE_ENABLED;

import static com.android.server.devicestate.OverrideRequestController.FLAG_THERMAL_CRITICAL;

import static com.android.server.devicestate.OverrideRequestController.STATUS_ACTIVE;

import static com.android.server.devicestate.OverrideRequestController.STATUS_CANCELED;
@@ -609,7 +610,8 @@ public final class DeviceStateManagerService extends SystemService { 


    @GuardedBy("mLock")

    private void onOverrideRequestStatusChangedLocked(@NonNull OverrideRequest request,

            @OverrideRequestController.RequestStatus int status, int flags) {

            @OverrideRequestController.RequestStatus int status,

            @OverrideRequestController.StatusChangedFlag int flags) {

        if (request.getRequestType() == OVERRIDE_REQUEST_TYPE_BASE_STATE) {

            switch (status) {

                case STATUS_ACTIVE:
@@ -641,6 +643,10 @@ public final class DeviceStateManagerService extends SystemService { 
                            mDeviceStateNotificationController

                                    .showThermalCriticalNotificationIfNeeded(

                                            request.getRequestedState());

                        } else if ((flags & FLAG_POWER_SAVE_ENABLED) == FLAG_POWER_SAVE_ENABLED) {

                            mDeviceStateNotificationController

                                    .showPowerSaveNotificationIfNeeded(

                                            request.getRequestedState());

                        }

                    }

                    break;