Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0228761 authored by Jordan Liu's avatar Jordan Liu
Browse files

Fix issues from merge 

Update comments and missing break statement.

Test: no behavior change
Change-Id: I52e836bee8241e781978dac2b024d8c89d7f9be8
parent eafb4b87

core/java/android/view/IWindowManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -421,8 +421,8 @@ interface IWindowManager 
    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();

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −0
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    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;

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+2 −2
Original line number Diff line number Diff line
@@ -1752,8 +1752,8 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
    }



    /**

     * 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();