Merge cherrypicks of ['googleplex-android-review.googlesource.com/24107346',... (dc90112c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1762,6 +1762,15 @@ public final class DisplayManager {
		* 123,1,critical,0.8,default;123,1,moderate,0.6,id_2;456,2,moderate,0.9,critical,0.7
		*/
		String KEY_BRIGHTNESS_THROTTLING_DATA = "brightness_throttling_data";

		/**
		* Key for disabling screen wake locks while apps are in cached state.
		* Read value via {@link android.provider.DeviceConfig#getBoolean(String, String, boolean)}
		* with {@link android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER} as the namespace.
		* @hide
		*/
		String KEY_DISABLE_SCREEN_WAKE_LOCKS_WHILE_CACHED =
		"disable_screen_wake_locks_while_cached";
		}

		/**

services/core/java/com/android/server/display/feature/DeviceConfigParameterProvider.java

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.display.feature;

		import android.hardware.display.DisplayManager;
		import android.provider.DeviceConfig;
		import android.provider.DeviceConfigInterface;

		import java.util.concurrent.Executor;

		/**
		* Helper class to access all DeviceConfig features for display_manager namespace
		*
		**/
		public class DeviceConfigParameterProvider {

		private static final String TAG = "DisplayFeatureProvider";

		private final DeviceConfigInterface mDeviceConfig;

		public DeviceConfigParameterProvider(DeviceConfigInterface deviceConfig) {
		mDeviceConfig = deviceConfig;
		}

		public boolean isDisableScreenWakeLocksWhileCachedFeatureEnabled() {
		return mDeviceConfig.getBoolean(DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
		DisplayManager.DeviceConfig.KEY_DISABLE_SCREEN_WAKE_LOCKS_WHILE_CACHED, true);
		}

		/** add property change listener to DeviceConfig */
		public void addOnPropertiesChangedListener(Executor executor,
		DeviceConfig.OnPropertiesChangedListener listener) {
		mDeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_DISPLAY_MANAGER,
		executor, listener);
		}
		}

services/core/java/com/android/server/power/PowerManagerService.java

+46 −6

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.WorkSource;
		import android.os.WorkSource.WorkChain;
		import android.provider.DeviceConfigInterface;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.service.dreams.DreamManagerInternal;
		@@ -128,6 +129,7 @@ import com.android.server.UiThread;
		import com.android.server.UserspaceRebootLogger;
		import com.android.server.Watchdog;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.display.feature.DeviceConfigParameterProvider;
		import com.android.server.lights.LightsManager;
		import com.android.server.lights.LogicalLight;
		import com.android.server.policy.WindowManagerPolicy;
		@@ -323,6 +325,9 @@ public final class PowerManagerService extends SystemService
		private final Injector mInjector;
		private final PermissionCheckerWrapper mPermissionCheckerWrapper;
		private final PowerPropertiesWrapper mPowerPropertiesWrapper;
		private final DeviceConfigParameterProvider mDeviceConfigProvider;

		private boolean mDisableScreenWakeLocksWhileCached;

		private LightsManager mLightsManager;
		private BatteryManagerInternal mBatteryManagerInternal;
		@@ -1065,6 +1070,10 @@ public final class PowerManagerService extends SystemService
		}
		};
		}

		DeviceConfigParameterProvider createDeviceConfigParameterProvider() {
		return new DeviceConfigParameterProvider(DeviceConfigInterface.REAL);
		}
		}

		/** Interface for checking an app op permission */
		@@ -1161,6 +1170,7 @@ public final class PowerManagerService extends SystemService
		mInjector.createInattentiveSleepWarningController();
		mPermissionCheckerWrapper = mInjector.createPermissionCheckerWrapper();
		mPowerPropertiesWrapper = mInjector.createPowerPropertiesWrapper();
		mDeviceConfigProvider = mInjector.createDeviceConfigParameterProvider();

		mPowerGroupWakefulnessChangeListener = new PowerGroupWakefulnessChangeListener();

		@@ -1346,6 +1356,14 @@ public final class PowerManagerService extends SystemService

		mLightsManager = getLocalService(LightsManager.class);
		mAttentionLight = mLightsManager.getLight(LightsManager.LIGHT_ID_ATTENTION);
		updateDeviceConfigLocked();
		mDeviceConfigProvider.addOnPropertiesChangedListener(BackgroundThread.getExecutor(),
		properties -> {
		synchronized (mLock) {
		updateDeviceConfigLocked();
		updateWakeLockDisabledStatesLocked();
		}
		});

		// Initialize display power management.
		mDisplayManagerInternal.initPowerManagement(
		@@ -1545,6 +1563,12 @@ public final class PowerManagerService extends SystemService
		updatePowerStateLocked();
		}

		@GuardedBy("mLock")
		private void updateDeviceConfigLocked() {
		mDisableScreenWakeLocksWhileCached = mDeviceConfigProvider
		.isDisableScreenWakeLocksWhileCachedFeatureEnabled();
		}

		@RequiresPermission(value = android.Manifest.permission.TURN_SCREEN_ON, conditional = true)
		private void acquireWakeLockInternal(IBinder lock, int displayId, int flags, String tag,
		String packageName, WorkSource ws, String historyTag, int uid, int pid,
		@@ -2760,13 +2784,13 @@ public final class PowerManagerService extends SystemService
		/** Get wake lock summary flags that correspond to the given wake lock. */
		@SuppressWarnings("deprecation")
		private int getWakeLockSummaryFlags(WakeLock wakeLock) {
		if (wakeLock.mDisabled) {
		// We only respect this if the wake lock is not disabled.
		return 0;
		}
		switch (wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) {
		case PowerManager.PARTIAL_WAKE_LOCK:
		if (!wakeLock.mDisabled) {
		// We only respect this if the wake lock is not disabled.
		return WAKE_LOCK_CPU;
		}
		break;
		case PowerManager.FULL_WAKE_LOCK:
		return WAKE_LOCK_SCREEN_BRIGHT \| WAKE_LOCK_BUTTON_BRIGHT;
		case PowerManager.SCREEN_BRIGHT_WAKE_LOCK:
		@@ -4151,7 +4175,7 @@ public final class PowerManagerService extends SystemService
		for (int i = 0; i < numWakeLocks; i++) {
		final WakeLock wakeLock = mWakeLocks.get(i);
		if ((wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK)
		== PowerManager.PARTIAL_WAKE_LOCK) {
		== PowerManager.PARTIAL_WAKE_LOCK \|\| isScreenLock(wakeLock)) {
		if (setWakeLockDisabledStateLocked(wakeLock)) {
		changed = true;
		if (wakeLock.mDisabled) {
		@@ -4205,6 +4229,22 @@ public final class PowerManagerService extends SystemService
		}
		}
		return wakeLock.setDisabled(disabled);
		} else if (mDisableScreenWakeLocksWhileCached && isScreenLock(wakeLock)) {
		boolean disabled = false;
		final int appid = UserHandle.getAppId(wakeLock.mOwnerUid);
		final UidState state = wakeLock.mUidState;
		// Cached inactive processes are never allowed to hold wake locks.
		if (mConstants.NO_CACHED_WAKE_LOCKS
		&& appid >= Process.FIRST_APPLICATION_UID
		&& !state.mActive
		&& state.mProcState != ActivityManager.PROCESS_STATE_NONEXISTENT
		&& state.mProcState >= ActivityManager.PROCESS_STATE_TOP_SLEEPING) {
		if (DEBUG_SPEW) {
		Slog.d(TAG, "disabling full wakelock " + wakeLock);
		}
		disabled = true;
		}
		return wakeLock.setDisabled(disabled);
		}
		return false;
		}

services/core/java/com/android/server/wm/Dimmer.java

+6 −9

Original line number	Diff line number	Diff line
		@@ -215,8 +215,7 @@ class Dimmer {
		return mDimState;
		}

		private void dim(SurfaceControl.Transaction t, WindowContainer container, int relativeLayer,
		float alpha, int blurRadius) {
		private void dim(WindowContainer container, int relativeLayer, float alpha, int blurRadius) {
		final DimState d = getDimState(container);

		if (d == null) {
		@@ -226,6 +225,7 @@ class Dimmer {
		// The dim method is called from WindowState.prepareSurfaces(), which is always called
		// in the correct Z from lowest Z to highest. This ensures that the dim layer is always
		// relative to the highest Z layer with a dim.
		SurfaceControl.Transaction t = mHost.getPendingTransaction();
		t.setRelativeLayer(d.mDimLayer, container.getSurfaceControl(), relativeLayer);
		t.setAlpha(d.mDimLayer, alpha);
		t.setBackgroundBlurRadius(d.mDimLayer, blurRadius);
		@@ -238,26 +238,23 @@ class Dimmer {
		* for each call to {@link WindowContainer#prepareSurfaces} the Dim state will be reset
		* and the child should call dimAbove again to request the Dim to continue.
		*
		* @param t A transaction in which to apply the Dim.
		* @param container The container which to dim above. Should be a child of our host.
		* @param alpha The alpha at which to Dim.
		*/
		void dimAbove(SurfaceControl.Transaction t, WindowContainer container, float alpha) {
		dim(t, container, 1, alpha, 0);
		void dimAbove(WindowContainer container, float alpha) {
		dim(container, 1, alpha, 0);
		}

		/**
		* Like {@link #dimAbove} but places the dim below the given container.
		*
		* @param t A transaction in which to apply the Dim.
		* @param container The container which to dim below. Should be a child of our host.
		* @param alpha The alpha at which to Dim.
		* @param blurRadius The amount of blur added to the Dim.
		*/

		void dimBelow(SurfaceControl.Transaction t, WindowContainer container, float alpha,
		int blurRadius) {
		dim(t, container, -1, alpha, blurRadius);
		void dimBelow(WindowContainer container, float alpha, int blurRadius) {
		dim(container, -1, alpha, blurRadius);
		}

		/**

services/core/java/com/android/server/wm/WindowState.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -5128,7 +5128,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP

		private void applyDims() {
		if (((mAttrs.flags & FLAG_DIM_BEHIND) != 0 \|\| shouldDrawBlurBehind())
		&& isVisibleNow() && !mHidden && mTransitionController.canApplyDim(getTask())) {
		&& mToken.isVisibleRequested() && isVisibleNow() && !mHidden
		&& mTransitionController.canApplyDim(getTask())) {
		// Only show the Dimmer when the following is satisfied:
		// 1. The window has the flag FLAG_DIM_BEHIND or blur behind is requested
		// 2. The WindowToken is not hidden so dims aren't shown when the window is exiting.
		@@ -5138,7 +5139,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		mIsDimming = true;
		final float dimAmount = (mAttrs.flags & FLAG_DIM_BEHIND) != 0 ? mAttrs.dimAmount : 0;
		final int blurRadius = shouldDrawBlurBehind() ? mAttrs.getBlurBehindRadius() : 0;
		getDimmer().dimBelow(getSyncTransaction(), this, dimAmount, blurRadius);
		getDimmer().dimBelow(this, dimAmount, blurRadius);
		}
		}