Merge "Remove PowerManager.ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED." (30cc2515) · Commits · e / os / android_frameworks_base

api/system-removed.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -151,11 +151,6 @@ package android.os {
		field public static final boolean PERMISSIONS_REVIEW_REQUIRED = true;
		}

		public final class PowerManager {
		method @Deprecated public boolean isScreenBrightnessBoosted();
		field @Deprecated public static final String ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED = "android.os.action.SCREEN_BRIGHTNESS_BOOST_CHANGED";
		}

		}

		package android.service.notification {

core/java/android/os/PowerManager.java

+0 −26

Original line number	Diff line number	Diff line
		@@ -1289,20 +1289,6 @@ public final class PowerManager {
		}
		}

		/**
		* Returns whether the screen brightness is currently boosted to maximum, caused by a call
		* to {@link #boostScreenBrightness(long)}.
		* @return {@code True} if the screen brightness is currently boosted. {@code False} otherwise.
		*
		* @deprecated This call is rarely used and will be phased out soon.
		* @hide
		* @removed
		*/
		@SystemApi @Deprecated
		public boolean isScreenBrightnessBoosted() {
		return false;
		}

		/**
		* Returns true if the specified wake lock level is supported.
		*
		@@ -2030,18 +2016,6 @@ public final class PowerManager {
		@UnsupportedAppUsage
		public static final String EXTRA_POWER_SAVE_MODE = "mode";

		/**
		* Intent that is broadcast when the state of {@link #isScreenBrightnessBoosted()} has changed.
		* This broadcast is only sent to registered receivers.
		*
		* @deprecated This intent is rarely used and will be phased out soon.
		* @hide
		* @removed
		**/
		@SystemApi @Deprecated
		public static final String ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED
		= "android.os.action.SCREEN_BRIGHTNESS_BOOST_CHANGED";

		/**
		* Constant for PreIdleTimeout normal mode (default mode, not short nor extend timeout) .
		* @hide

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

+0 −39

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ public class Notifier {
		private static final int MSG_USER_ACTIVITY = 1;
		private static final int MSG_BROADCAST = 2;
		private static final int MSG_WIRELESS_CHARGING_STARTED = 3;
		private static final int MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED = 4;
		private static final int MSG_PROFILE_TIMED_OUT = 5;
		private static final int MSG_WIRED_CHARGING_STARTED = 6;

		@@ -127,7 +126,6 @@ public class Notifier {
		private final NotifierHandler mHandler;
		private final Intent mScreenOnIntent;
		private final Intent mScreenOffIntent;
		private final Intent mScreenBrightnessBoostIntent;

		// True if the device should suspend when the screen is off due to proximity.
		private final boolean mSuspendWhenScreenOffDueToProximityConfig;
		@@ -181,10 +179,6 @@ public class Notifier {
		mScreenOffIntent.addFlags(
		Intent.FLAG_RECEIVER_REGISTERED_ONLY \| Intent.FLAG_RECEIVER_FOREGROUND
		\| Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);
		mScreenBrightnessBoostIntent =
		new Intent(PowerManager.ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED);
		mScreenBrightnessBoostIntent.addFlags(
		Intent.FLAG_RECEIVER_REGISTERED_ONLY \| Intent.FLAG_RECEIVER_FOREGROUND);

		mSuspendWhenScreenOffDueToProximityConfig = context.getResources().getBoolean(
		com.android.internal.R.bool.config_suspendWhenScreenOffDueToProximity);
		@@ -559,20 +553,6 @@ public class Notifier {
		}
		}

		/**
		* Called when screen brightness boost begins or ends.
		*/
		public void onScreenBrightnessBoostChanged() {
		if (DEBUG) {
		Slog.d(TAG, "onScreenBrightnessBoostChanged");
		}

		mSuspendBlocker.acquire();
		Message msg = mHandler.obtainMessage(MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED);
		msg.setAsynchronous(true);
		mHandler.sendMessage(msg);
		}

		/**
		* Called when there has been user activity.
		*/
		@@ -729,22 +709,6 @@ public class Notifier {
		}
		}

		private void sendBrightnessBoostChangedBroadcast() {
		if (DEBUG) {
		Slog.d(TAG, "Sending brightness boost changed broadcast.");
		}

		mContext.sendOrderedBroadcastAsUser(mScreenBrightnessBoostIntent, UserHandle.ALL, null,
		mScreeBrightnessBoostChangedDone, mHandler, 0, null, null);
		}

		private final BroadcastReceiver mScreeBrightnessBoostChangedDone = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		mSuspendBlocker.release();
		}
		};

		private void sendWakeUpBroadcast() {
		if (DEBUG) {
		Slog.d(TAG, "Sending wake up broadcast.");
		@@ -861,9 +825,6 @@ public class Notifier {
		case MSG_WIRELESS_CHARGING_STARTED:
		showWirelessChargingStarted(msg.arg1, msg.arg2);
		break;
		case MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED:
		sendBrightnessBoostChangedBroadcast();
		break;
		case MSG_PROFILE_TIMED_OUT:
		lockProfile(msg.arg1);
		break;

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -2516,7 +2516,6 @@ public final class PowerManagerService extends SystemService
		}
		}
		mScreenBrightnessBoostInProgress = false;
		mNotifier.onScreenBrightnessBoostChanged();
		userActivityNoUpdateLocked(now,
		PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
		}
		@@ -3123,10 +3122,7 @@ public final class PowerManagerService extends SystemService

		Slog.i(TAG, "Brightness boost activated (uid " + uid +")...");
		mLastScreenBrightnessBoostTime = eventTime;
		if (!mScreenBrightnessBoostInProgress) {
		mScreenBrightnessBoostInProgress = true;
		mNotifier.onScreenBrightnessBoostChanged();
		}
		mDirty \|= DIRTY_SCREEN_BRIGHTNESS_BOOST;

		userActivityNoUpdateLocked(eventTime,