Merge "Remove powerHint from IPowerManager.aidl" (218a05d4) · Commits · e / os / android_frameworks_base

core/java/android/os/IPowerManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ interface IPowerManager
		@UnsupportedAppUsage
		void releaseWakeLock(IBinder lock, int flags);
		void updateWakeLockUids(IBinder lock, in int[] uids);
		oneway void powerHint(int hintId, int data);
		oneway void setPowerBoost(int boost, int durationMs);
		oneway void setPowerMode(int mode, boolean enabled);

core/java/android/os/PowerManagerInternal.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -195,12 +195,6 @@ public abstract class PowerManagerInternal {

		public abstract void uidIdle(int uid);

		/**
		* The hintId sent through this method should be in-line with the
		* PowerHint defined in android/hardware/power/<version 1.0 & up>/IPower.h
		*/
		public abstract void powerHint(int hintId, int data);

		/**
		* Boost: It is sent when user interacting with the device, for example,
		* touchscreen events are incoming.

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

+13 −59

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import android.hardware.SystemSensorManager;
		import android.hardware.display.AmbientDisplayConfiguration;
		import android.hardware.display.DisplayManagerInternal;
		import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;
		import android.hardware.power.V1_0.PowerHint;
		import android.hardware.power.Mode;
		import android.net.Uri;
		import android.os.BatteryManager;
		import android.os.BatteryManagerInternal;
		@@ -202,9 +202,6 @@ public final class PowerManagerService extends SystemService
		// How long a partial wake lock must be held until we consider it a long wake lock.
		static final long MIN_LONG_WAKE_CHECK_INTERVAL = 60*1000;

		// Power features defined in hardware/libhardware/include/hardware/power.h.
		private static final int POWER_FEATURE_DOUBLE_TAP_TO_WAKE = 1;

		// Default setting for double tap to wake.
		private static final int DEFAULT_DOUBLE_TAP_TO_WAKE = 0;

		@@ -324,7 +321,7 @@ public final class PowerManagerService extends SystemService
		private long mLastUserActivityTime;
		private long mLastUserActivityTimeNoChangeLights;

		// Timestamp of last interactive power hint.
		// Timestamp of last time power mode was set to interactive.
		private long mLastInteractivePowerHintTime;

		// Timestamp of the last screen brightness boost.
		@@ -718,21 +715,11 @@ public final class PowerManagerService extends SystemService
		PowerManagerService.nativeReleaseSuspendBlocker(name);
		}

		/** Wrapper for PowerManager.nativeSetInteractive */
		public void nativeSetInteractive(boolean enable) {
		PowerManagerService.nativeSetInteractive(enable);
		}

		/** Wrapper for PowerManager.nativeSetAutoSuspend */
		public void nativeSetAutoSuspend(boolean enable) {
		PowerManagerService.nativeSetAutoSuspend(enable);
		}

		/** Wrapper for PowerManager.nativeSendPowerHint */
		public void nativeSendPowerHint(int hintId, int data) {
		PowerManagerService.nativeSendPowerHint(hintId, data);
		}

		/** Wrapper for PowerManager.nativeSetPowerBoost */
		public void nativeSetPowerBoost(int boost, int durationMs) {
		PowerManagerService.nativeSetPowerBoost(boost, durationMs);
		@@ -743,11 +730,6 @@ public final class PowerManagerService extends SystemService
		return PowerManagerService.nativeSetPowerMode(mode, enabled);
		}

		/** Wrapper for PowerManager.nativeSetFeature */
		public void nativeSetFeature(int featureId, int data) {
		PowerManagerService.nativeSetFeature(featureId, data);
		}

		/** Wrapper for PowerManager.nativeForceSuspend */
		public boolean nativeForceSuspend() {
		return PowerManagerService.nativeForceSuspend();
		@@ -850,12 +832,9 @@ public final class PowerManagerService extends SystemService
		private native void nativeInit();
		private static native void nativeAcquireSuspendBlocker(String name);
		private static native void nativeReleaseSuspendBlocker(String name);
		private static native void nativeSetInteractive(boolean enable);
		private static native void nativeSetAutoSuspend(boolean enable);
		private static native void nativeSendPowerHint(int hintId, int data);
		private static native void nativeSetPowerBoost(int boost, int durationMs);
		private static native boolean nativeSetPowerMode(int mode, boolean enabled);
		private static native void nativeSetFeature(int featureId, int data);
		private static native boolean nativeForceSuspend();

		public PowerManagerService(Context context) {
		@@ -999,8 +978,8 @@ public final class PowerManagerService extends SystemService

		mNativeWrapper.nativeInit(this);
		mNativeWrapper.nativeSetAutoSuspend(false);
		mNativeWrapper.nativeSetInteractive(true);
		mNativeWrapper.nativeSetFeature(POWER_FEATURE_DOUBLE_TAP_TO_WAKE, 0);
		mNativeWrapper.nativeSetPowerMode(Mode.INTERACTIVE, true);
		mNativeWrapper.nativeSetPowerMode(Mode.DOUBLE_TAP_TO_WAKE, false);
		mInjector.invalidateIsInteractiveCaches();
		}
		}
		@@ -1251,8 +1230,7 @@ public final class PowerManagerService extends SystemService
		UserHandle.USER_CURRENT) != 0;
		if (doubleTapWakeEnabled != mDoubleTapWakeEnabled) {
		mDoubleTapWakeEnabled = doubleTapWakeEnabled;
		mNativeWrapper.nativeSetFeature(
		POWER_FEATURE_DOUBLE_TAP_TO_WAKE, mDoubleTapWakeEnabled ? 1 : 0);
		mNativeWrapper.nativeSetPowerMode(Mode.DOUBLE_TAP_TO_WAKE, mDoubleTapWakeEnabled);
		}
		}

		@@ -1611,7 +1589,7 @@ public final class PowerManagerService extends SystemService
		Trace.traceBegin(Trace.TRACE_TAG_POWER, "userActivity");
		try {
		if (eventTime > mLastInteractivePowerHintTime) {
		powerHintInternal(PowerHint.INTERACTION, 0);
		setPowerModeInternal(Mode.INTERACTIVE, false);
		mLastInteractivePowerHintTime = eventTime;
		}

		@@ -3170,7 +3148,7 @@ public final class PowerManagerService extends SystemService
		mHalInteractiveModeEnabled = enable;
		Trace.traceBegin(Trace.TRACE_TAG_POWER, "setHalInteractive(" + enable + ")");
		try {
		mNativeWrapper.nativeSetInteractive(enable);
		mNativeWrapper.nativeSetPowerMode(Mode.INTERACTIVE, enable);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_POWER);
		}
		@@ -3644,19 +3622,6 @@ public final class PowerManagerService extends SystemService
		mIsVrModeEnabled = enabled;
		}

		private void powerHintInternal(int hintId, int data) {
		// Maybe filter the event.
		switch (hintId) {
		case PowerHint.LAUNCH: // 1: activate launch boost 0: deactivate.
		if (data == 1 && mBatterySaverController.isLaunchBoostDisabled()) {
		return;
		}
		break;
		}

		mNativeWrapper.nativeSendPowerHint(hintId, data);
		}

		private void setPowerBoostInternal(int boost, int durationMs) {
		// Maybe filter the event.
		mNativeWrapper.nativeSetPowerBoost(boost, durationMs);
		@@ -3664,6 +3629,9 @@ public final class PowerManagerService extends SystemService

		private boolean setPowerModeInternal(int mode, boolean enabled) {
		// Maybe filter the event.
		if (mode == Mode.LAUNCH && enabled && mBatterySaverController.isLaunchBoostDisabled()) {
		return false;
		}
		return mNativeWrapper.nativeSetPowerMode(mode, enabled);
		}

		@@ -4400,7 +4368,7 @@ public final class PowerManagerService extends SystemService
		private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() {
		@Override
		public void onVrStateChanged(boolean enabled) {
		powerHintInternal(PowerHint.VR_MODE, enabled ? 1 : 0);
		setPowerModeInternal(Mode.VR, enabled);

		synchronized (mLock) {
		if (mIsVrModeEnabled != enabled) {
		@@ -4710,16 +4678,6 @@ public final class PowerManagerService extends SystemService
		acquireWakeLock(lock, flags, tag, packageName, new WorkSource(uid), null);
		}

		@Override // Binder call
		public void powerHint(int hintId, int data) {
		if (!mSystemReady) {
		// Service not ready yet, so who the heck cares about power hints, bah.
		return;
		}
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
		powerHintInternal(hintId, data);
		}

		@Override // Binder call
		public void setPowerBoost(int boost, int durationMs) {
		if (!mSystemReady) {
		@@ -5554,11 +5512,6 @@ public final class PowerManagerService extends SystemService
		uidIdleInternal(uid);
		}

		@Override
		public void powerHint(int hintId, int data) {
		powerHintInternal(hintId, data);
		}

		@Override
		public void setPowerBoost(int boost, int durationMs) {
		setPowerBoostInternal(boost, durationMs);
		@@ -5568,6 +5521,7 @@ public final class PowerManagerService extends SystemService
		public void setPowerMode(int mode, boolean enabled) {
		setPowerModeInternal(mode, enabled);
		}

		@Override
		public boolean wasDeviceIdleFor(long ms) {
		return wasDeviceIdleForInternal(ms);

services/core/java/com/android/server/power/batterysaver/BatterySaverController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManagerInternal;
		import android.hardware.power.V1_0.PowerHint;
		import android.hardware.power.Mode;
		import android.os.BatteryManager;
		import android.os.BatterySaverPolicyConfig;
		import android.os.Handler;
		@@ -474,7 +474,7 @@ public class BatterySaverController implements BatterySaverPolicyListener {

		final PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
		if (pmi != null) {
		pmi.powerHint(PowerHint.LOW_POWER, isEnabled() ? 1 : 0);
		pmi.setPowerMode(Mode.LOW_POWER, isEnabled());
		}

		updateBatterySavingStats();

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1741,8 +1741,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		return;
		}

		// Send launch end powerhint before going sleep
		mRootWindowContainer.sendPowerHintForLaunchEndIfNeeded();
		// End power mode launch before going sleep
		mRootWindowContainer.endPowerModeLaunchIfNeeded();

		removeSleepTimeouts();

		@@ -2492,7 +2492,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		&& task.getRootActivity() != null) {
		final ActivityRecord targetActivity = task.getTopNonFinishingActivity();

		mRootWindowContainer.sendPowerHintForLaunchStartIfNeeded(
		mRootWindowContainer.startPowerModeLaunchIfNeeded(
		true /* forceSend */, targetActivity);
		final LaunchingState launchingState =
		mActivityMetricsLogger.notifyActivityLaunching(task.intent);