Merge "Add TRON logs"

2017-03-18 17:36:57 +00:00
parent 8189db463c 50d946c13a
commit cf2c279a23
5 changed files with 83 additions and 17 deletions
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -158,6 +158,12 @@ public class ActivityInfo extends ComponentInfo
     */
    public String targetActivity;

+    /**
+     * Token used to string together multiple events within a single launch action.
+     * @hide
+     */
+    public String launchToken;
+
    /**
     * Activity can not be resized and always occupies the fullscreen area with all windows fully
     * visible.