Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass display ID to PowerManagerService on user interaction" into sc-dev

Browse Source
This commit is contained in:
Sean Stout
2021-02-25 10:28:37 +00:00
committed by Android (Google) Code Review
parent 1efa93d72c 8026771833
commit b80cfeeddb
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -1645,7 +1645,7 @@ public final class PowerManagerService extends SystemService
} }
// Called from native code. // Called from native code.
private void userActivityFromNative(long eventTime, int event, int flags) { private void userActivityFromNative(long eventTime, int event, int displayId, int flags) {
userActivityInternal(eventTime, event, flags, Process.SYSTEM_UID); userActivityInternal(eventTime, event, flags, Process.SYSTEM_UID);
} }

6
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -331,7 +331,7 @@ public:
uint32_t policyFlags) override; uint32_t policyFlags) override;
bool dispatchUnhandledKey(const sp<IBinder>& token, const KeyEvent* keyEvent, bool dispatchUnhandledKey(const sp<IBinder>& token, const KeyEvent* keyEvent,
uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) override; uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) override;
void pokeUserActivity(nsecs_t eventTime, int32_t eventType) override; void pokeUserActivity(nsecs_t eventTime, int32_t eventType, int32_t displayId) override;
bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid, int32_t injectorUid) override; bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid, int32_t injectorUid) override;
void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override; void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override;
void setPointerCapture(bool enabled) override; void setPointerCapture(bool enabled) override;
@@ -1325,9 +1325,9 @@ bool NativeInputManager::dispatchUnhandledKey(const sp<IBinder>& token,
return result; return result;
} }
void NativeInputManager::pokeUserActivity(nsecs_t eventTime, int32_t eventType) { void NativeInputManager::pokeUserActivity(nsecs_t eventTime, int32_t eventType, int32_t displayId) {
ATRACE_CALL(); ATRACE_CALL();
android_server_PowerManagerService_userActivity(eventTime, eventType); android_server_PowerManagerService_userActivity(eventTime, eventType, displayId);
} }
bool NativeInputManager::checkInjectEventsPermissionNonReentrant( bool NativeInputManager::checkInjectEventsPermissionNonReentrant(

7
services/core/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -103,7 +103,8 @@ static bool setPowerMode(Mode mode, bool enabled) {
return result == power::HalResult::SUCCESSFUL; return result == power::HalResult::SUCCESSFUL;
} }
void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType) { void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType,
int32_t displayId) {
if (gPowerManagerServiceObj) { if (gPowerManagerServiceObj) {
// Throttle calls into user activity by event type. // Throttle calls into user activity by event type.
// We're a little conservative about argument checking here in case the caller // We're a little conservative about argument checking here in case the caller
@@ -127,7 +128,7 @@ void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t
env->CallVoidMethod(gPowerManagerServiceObj, env->CallVoidMethod(gPowerManagerServiceObj,
gPowerManagerServiceClassInfo.userActivityFromNative, gPowerManagerServiceClassInfo.userActivityFromNative,
nanoseconds_to_milliseconds(eventTime), eventType, 0); nanoseconds_to_milliseconds(eventTime), eventType, displayId, 0);
checkAndClearExceptionFromCallback(env, "userActivityFromNative"); checkAndClearExceptionFromCallback(env, "userActivityFromNative");
} }
} }
@@ -285,7 +286,7 @@ int register_android_server_PowerManagerService(JNIEnv* env) {
FIND_CLASS(clazz, "com/android/server/power/PowerManagerService"); FIND_CLASS(clazz, "com/android/server/power/PowerManagerService");
GET_METHOD_ID(gPowerManagerServiceClassInfo.userActivityFromNative, clazz, GET_METHOD_ID(gPowerManagerServiceClassInfo.userActivityFromNative, clazz,
"userActivityFromNative", "(JII)V"); "userActivityFromNative", "(JIII)V");
// Initialize // Initialize
for (int i = 0; i <= USER_ACTIVITY_EVENT_LAST; i++) { for (int i = 0; i <= USER_ACTIVITY_EVENT_LAST; i++) {

3
services/core/jni/com_android_server_power_PowerManagerService.h
View File

@@ -24,7 +24,8 @@
namespace android { namespace android {
extern void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType); extern void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType,
int32_t displayId);
} // namespace android } // namespace android