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

Commit 8b3274e7 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix issues from merge"

parents 2956b37b c0228761

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
@@ -917,6 +917,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
@@ -1711,8 +1711,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();