| commit | c022876124a2b1f42e64789e8e7103cdc07699dd | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Fri Jul 13 11:39:42 2018 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Fri Jul 13 11:48:52 2018 -0700 |
| tree | 44c3eb4be5abedd13f67f311ed47ea3d147de312 | |
| parent | eafb4b87de62f6c303c56c40009ea6400a643c0f [diff] |
Fix issues from merge Update comments and missing break statement. Test: no behavior change Change-Id: I52e836bee8241e781978dac2b024d8c89d7f9be8
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 131fe13..092702c 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl
@@ -421,8 +421,8 @@ boolean isWindowTraceEnabled(); /** - * Requests that the WindowManager sends WindowManagerPolicy#ACTION_USER_ACTIVITY_NOTIFICATION - * on the next user activity. + * Requests that the WindowManager sends + * WindowManagerPolicyConstants#ACTION_USER_ACTIVITY_NOTIFICATION on the next user activity. */ void requestUserActivityNotification();
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 8b0375f..add8286 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -954,6 +954,7 @@ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); mContext.sendBroadcastAsUser(intent, UserHandle.ALL, android.Manifest.permission.USER_ACTIVITY); + break; case MSG_RINGER_TOGGLE_CHORD: handleRingerChordGesture(); break;
diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 9fbe419..2efbc33 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
@@ -1752,8 +1752,8 @@ } /** - * Requests that the WindowManager sends WindowManagerPolicy#ACTION_USER_ACTIVITY_NOTIFICATION - * on the next user activity. + * Requests that the WindowManager sends + * WindowManagerPolicyConstants#ACTION_USER_ACTIVITY_NOTIFICATION on the next user activity. */ public void requestUserActivityNotification();