From b696de5c10ebcc7bf42d8487fc0e56e0e937754d Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Fri, 27 Jul 2012 15:38:50 -0700 Subject: Move and rename user activity event type constants. Change-Id: Ie565808796773b6896e71ddfac6aaaf8031de846 --- core/java/android/os/LocalPowerManager.java | 6 ------ core/java/android/os/PowerManager.java | 21 +++++++++++++++++++++ include/androidfw/PowerManager.h | 8 ++++---- .../internal/policy/impl/PhoneWindowManager.java | 6 +++--- services/input/InputDispatcher.cpp | 6 +++--- .../android/server/power/PowerManagerService.java | 16 ++++++++-------- .../com/android/server/wm/WindowManagerService.java | 3 +-- ...com_android_server_input_InputManagerService.cpp | 2 +- ...com_android_server_power_PowerManagerService.cpp | 6 +++--- 9 files changed, 44 insertions(+), 30 deletions(-) diff --git a/core/java/android/os/LocalPowerManager.java b/core/java/android/os/LocalPowerManager.java index 52df1f8..09336c7 100644 --- a/core/java/android/os/LocalPowerManager.java +++ b/core/java/android/os/LocalPowerManager.java @@ -18,12 +18,6 @@ package android.os; /** @hide */ public interface LocalPowerManager { - // Note: be sure to update BatteryStats if adding or modifying event constants. - - public static final int OTHER_EVENT = 0; - public static final int BUTTON_EVENT = 1; - public static final int TOUCH_EVENT = 2; - public static final int POKE_LOCK_IGNORE_TOUCH_EVENTS = 0x1; public static final int POKE_LOCK_SHORT_TIMEOUT = 0x2; diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index b455aab..a757303 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -250,6 +250,27 @@ public final class PowerManager { */ public static final int BRIGHTNESS_OFF = 0; + // Note: Be sure to update android.os.BatteryStats and PowerManager.h + // if adding or modifying user activity event constants. + + /** + * User activity event type: Unspecified event type. + * @hide + */ + public static final int USER_ACTIVITY_EVENT_OTHER = 0; + + /** + * User activity event type: Button or key pressed or released. + * @hide + */ + public static final int USER_ACTIVITY_EVENT_BUTTON = 1; + + /** + * User activity event type: Touch down, move or up. + * @hide + */ + public static final int USER_ACTIVITY_EVENT_TOUCH = 2; + final IPowerManager mService; final Handler mHandler; diff --git a/include/androidfw/PowerManager.h b/include/androidfw/PowerManager.h index 59e993a..ba98db0 100644 --- a/include/androidfw/PowerManager.h +++ b/include/androidfw/PowerManager.h @@ -21,11 +21,11 @@ namespace android { enum { - POWER_MANAGER_OTHER_EVENT = 0, - POWER_MANAGER_BUTTON_EVENT = 1, - POWER_MANAGER_TOUCH_EVENT = 2, + USER_ACTIVITY_EVENT_OTHER = 0, + USER_ACTIVITY_EVENT_BUTTON = 1, + USER_ACTIVITY_EVENT_TOUCH = 2, - POWER_MANAGER_LAST_EVENT = POWER_MANAGER_TOUCH_EVENT, // Last valid event code. + USER_ACTIVITY_EVENT_LAST = USER_ACTIVITY_EVENT_TOUCH, // Last valid event code. }; } // namespace android diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 867f4f4..15d53fb 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3021,11 +3021,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { KeyEvent.KEYCODE_POWER, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED); } else { mPowerManager.userActivity(SystemClock.uptimeMillis(), false, - LocalPowerManager.BUTTON_EVENT); + PowerManager.USER_ACTIVITY_EVENT_BUTTON); } } else if (!mLidControlsSleep) { mPowerManager.userActivity(SystemClock.uptimeMillis(), false, - LocalPowerManager.OTHER_EVENT); + PowerManager.USER_ACTIVITY_EVENT_OTHER); } } @@ -4319,7 +4319,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mPowerManager.isScreenOn()) { if (mKeyguardMediator != null && !mKeyguardMediator.isShowingAndNotHidden()) { long curTime = SystemClock.uptimeMillis(); - mPowerManager.userActivity(curTime, false, LocalPowerManager.OTHER_EVENT); + mPowerManager.userActivity(curTime, false, PowerManager.USER_ACTIVITY_EVENT_OTHER); } synchronized (mLock) { diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index e63da05..8604f95 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -1693,7 +1693,7 @@ String8 InputDispatcher::getApplicationWindowLabelLocked( } void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) { - int32_t eventType = POWER_MANAGER_OTHER_EVENT; + int32_t eventType = USER_ACTIVITY_EVENT_OTHER; switch (eventEntry->type) { case EventEntry::TYPE_MOTION: { const MotionEntry* motionEntry = static_cast(eventEntry); @@ -1702,7 +1702,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) { } if (MotionEvent::isTouchEvent(motionEntry->source, motionEntry->action)) { - eventType = POWER_MANAGER_TOUCH_EVENT; + eventType = USER_ACTIVITY_EVENT_TOUCH; } break; } @@ -1711,7 +1711,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) { if (keyEntry->flags & AKEY_EVENT_FLAG_CANCELED) { return; } - eventType = POWER_MANAGER_BUTTON_EVENT; + eventType = USER_ACTIVITY_EVENT_BUTTON; break; } } diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index b3cd0f2..453c7a4 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1037,7 +1037,7 @@ public class PowerManagerService extends IPowerManager.Stub mWakeLockState = mLocks.gatherState(); // goes in the middle to reduce flicker if ((wl.flags & PowerManager.ON_AFTER_RELEASE) != 0) { - userActivity(SystemClock.uptimeMillis(), -1, false, OTHER_EVENT, false, true); + userActivity(SystemClock.uptimeMillis(), -1, false, PowerManager.USER_ACTIVITY_EVENT_OTHER, false, true); } setPowerState(mWakeLockState | mUserState); } @@ -2467,7 +2467,7 @@ public class PowerManagerService extends IPowerManager.Stub public void userActivityWithForce(long time, boolean noChangeLights, boolean force) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); - userActivity(time, -1, noChangeLights, OTHER_EVENT, force, false); + userActivity(time, -1, noChangeLights, PowerManager.USER_ACTIVITY_EVENT_OTHER, force, false); } public void userActivity(long time, boolean noChangeLights) { @@ -2480,7 +2480,7 @@ public class PowerManagerService extends IPowerManager.Stub return; } - userActivity(time, -1, noChangeLights, OTHER_EVENT, false, false); + userActivity(time, -1, noChangeLights, PowerManager.USER_ACTIVITY_EVENT_OTHER, false, false); } public void userActivity(long time, boolean noChangeLights, int eventType) { @@ -2498,13 +2498,13 @@ public class PowerManagerService extends IPowerManager.Stub public void clearUserActivityTimeout(long now, long timeout) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); Slog.i(TAG, "clearUserActivity for " + timeout + "ms from now"); - userActivity(now, timeout, false, OTHER_EVENT, false, false); + userActivity(now, timeout, false, PowerManager.USER_ACTIVITY_EVENT_OTHER, false, false); } private void userActivity(long time, long timeoutOverride, boolean noChangeLights, int eventType, boolean force, boolean ignoreIfScreenOff) { - if (((mPokey & POKE_LOCK_IGNORE_TOUCH_EVENTS) != 0) && (eventType == TOUCH_EVENT)) { + if (((mPokey & POKE_LOCK_IGNORE_TOUCH_EVENTS) != 0) && (eventType == PowerManager.USER_ACTIVITY_EVENT_TOUCH)) { if (false) { Slog.d(TAG, "dropping touch mPokey=0x" + Integer.toHexString(mPokey)); } @@ -2541,7 +2541,7 @@ public class PowerManagerService extends IPowerManager.Stub if ((mUserActivityAllowed && !mProximitySensorActive) || force) { // Only turn on button backlights if a button was pressed // and auto brightness is disabled - if (eventType == BUTTON_EVENT && !mUseSoftwareAutoBrightness) { + if (eventType == PowerManager.USER_ACTIVITY_EVENT_BUTTON && !mUseSoftwareAutoBrightness) { mUserState = (mKeyboardVisible ? ALL_BRIGHT : SCREEN_BUTTON_BRIGHT); } else { // don't clear button/keyboard backlights when the screen is touched. @@ -2869,7 +2869,7 @@ public class PowerManagerService extends IPowerManager.Stub lightSensorChangedLocked(value, false); } } - userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true); + userActivity(SystemClock.uptimeMillis(), false, PowerManager.USER_ACTIVITY_EVENT_BUTTON, true); } } } @@ -3086,7 +3086,7 @@ public class PowerManagerService extends IPowerManager.Stub Slog.d(TAG, "bootCompleted"); synchronized (mLocks) { mBootCompleted = true; - userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true); + userActivity(SystemClock.uptimeMillis(), false, PowerManager.USER_ACTIVITY_EVENT_BUTTON, true); updateWakeLockLocked(); mLocks.notifyAll(); } diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index f9e121c..d0aea12 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -80,7 +80,6 @@ import android.os.Debug; import android.os.Handler; import android.os.IBinder; import android.os.IRemoteCallback; -import android.os.LocalPowerManager; import android.os.Looper; import android.os.Message; import android.os.Parcel; @@ -8952,7 +8951,7 @@ public class WindowManagerService extends IWindowManager.Stub if (mTurnOnScreen) { if (DEBUG_VISIBILITY) Slog.v(TAG, "Turning screen on after layout!"); mPowerManager.userActivity(SystemClock.uptimeMillis(), false, - LocalPowerManager.BUTTON_EVENT, true); + PowerManager.USER_ACTIVITY_EVENT_BUTTON, true); mTurnOnScreen = false; } diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/jni/com_android_server_input_InputManagerService.cpp index 57e1c28..35c2142 100644 --- a/services/jni/com_android_server_input_InputManagerService.cpp +++ b/services/jni/com_android_server_input_InputManagerService.cpp @@ -903,7 +903,7 @@ void NativeInputManager::handleInterceptActions(jint wmActions, nsecs_t when, #if DEBUG_INPUT_DISPATCHER_POLICY ALOGD("handleInterceptActions: Poking user activity."); #endif - android_server_PowerManagerService_userActivity(when, POWER_MANAGER_BUTTON_EVENT); + android_server_PowerManagerService_userActivity(when, USER_ACTIVITY_EVENT_BUTTON); } if (wmActions & WM_ACTION_PASS_TO_USER) { diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp index 2690b68..acce97e 100644 --- a/services/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/jni/com_android_server_power_PowerManagerService.cpp @@ -55,7 +55,7 @@ static Mutex gPowerManagerLock; static bool gScreenOn; static bool gScreenBright; -static nsecs_t gLastEventTime[POWER_MANAGER_LAST_EVENT + 1]; +static nsecs_t gLastEventTime[USER_ACTIVITY_EVENT_LAST + 1]; // Throttling interval for user activity calls. static const nsecs_t MIN_TIME_BETWEEN_USERACTIVITIES = 500 * 1000000L; // 500ms @@ -92,7 +92,7 @@ void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t // Throttle calls into user activity by event type. // We're a little conservative about argument checking here in case the caller // passes in bad data which could corrupt system state. - if (eventType >= 0 && eventType <= POWER_MANAGER_LAST_EVENT) { + if (eventType >= 0 && eventType <= USER_ACTIVITY_EVENT_LAST) { nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC); if (eventTime > now) { eventTime = now; @@ -262,7 +262,7 @@ int register_android_server_PowerManagerService(JNIEnv* env) { "userActivity", "(JZIZ)V"); // Initialize - for (int i = 0; i < POWER_MANAGER_LAST_EVENT; i++) { + for (int i = 0; i <= USER_ACTIVITY_EVENT_LAST; i++) { gLastEventTime[i] = LLONG_MIN; } gScreenOn = true; -- cgit v1.1