Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command" into pi-dev

core/java/android/view/IWindowManager.aidl

@@ -416,4 +416,10 @@ interface IWindowManager
      * Returns true if window trace is enabled.
      */
     boolean isWindowTraceEnabled();
+
+    /**
+     * Requests that the WindowManager sends WindowManagerPolicy#ACTION_USER_ACTIVITY_NOTIFICATION
+     * on the next user activity.
+     */
+    void requestUserActivityNotification();
 }

core/java/android/view/WindowManagerPolicyConstants.java

@@ -50,6 +50,12 @@ public interface WindowManagerPolicyConstants {
     int NAV_BAR_RIGHT = 1 << 1;
     int NAV_BAR_BOTTOM = 1 << 2;
 
+    /**
+     * Broadcast sent when a user activity is detected.
+     */
+    String ACTION_USER_ACTIVITY_NOTIFICATION =
+            "android.intent.action.USER_ACTIVITY_NOTIFICATION";
+
     /**
      * Sticky broadcast of the current HDMI plugged state.
      */