commit 7e3e41541e2724a6d5744a3307e111ed21d20205
author Gopinath <gelanchezhian@google.com> Tue Aug 30 10:13:35 2016 -0700
committer Gopinath <gelanchezhian@google.com> Tue Aug 30 16:48:08 2016 -0700
tree ef78fca4ba96367df52024355f8dfe7daf087739
parent c74038d53dee887f91196697d31045e0a8ecce38

Handle different hot launch activity name.

Apps like youtube has different hot launch activity name.
Set the orientation of the device to natural.

Change-Id: I7e0fd88926eac56ca405bf794b8dd71098f3107e

tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java

diff --git a/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java b/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
index 4da3570..c3e4538 100644
--- a/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
+++ b/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
@@ -74,6 +74,7 @@
     private static final String COLD_LAUNCH = "cold_launch";
     private static final String HOT_LAUNCH = "hot_launch";
     private static final String NOT_SURE = "not_sure";
+    private static final String ACTIVITY = "Activity";
     private static final String NOT_SUCCESSFUL_MESSAGE = "App launch not successful";
     private static final String KEY_TRACE_DIRECTORY = "trace_directory";
     private static final String KEY_TRACE_CATEGORY = "trace_categories";
@@ -104,6 +105,7 @@
     private int mTraceDumpInterval = 0;
     private Set<String> mTraceCategoriesSet = null;
     private AtraceLogger mAtraceLogger = null;
+    private String mComponentName = null;
 
     @Before
     public void setUp() throws Exception {
@@ -144,6 +146,7 @@
                 }
             }
         }
+        mDevice.setOrientationNatural();
         cleanTestApps();
     }
 
@@ -456,6 +459,7 @@
         } catch (InterruptedException e) {
             // ignore
         }
+        mComponentName = runnable.getCmpName();
         return runnable.getResult();
     }
 
@@ -463,6 +467,7 @@
         private Intent mLaunchIntent;
         private String mLaunchMode;
         private Long mResult = -1L;
+        private String mCmpName;
 
         public AppLaunchRunnable(Intent intent, String launchMode) {
             mLaunchIntent = intent;
@@ -473,6 +478,10 @@
             return mResult;
         }
 
+        public String getCmpName() {
+            return mCmpName;
+        }
+
         @Override
         public void run() {
             String packageName = mLaunchIntent.getComponent().getPackageName();
@@ -491,6 +500,7 @@
         private String parseLaunchTime(ParcelFileDescriptor parcelDesc) {
             String launchTime = "-1";
             boolean launchSuccess = false;
+            mCmpName = null;
             try {
                 InputStream inputStream = new FileInputStream(parcelDesc.getFileDescriptor());
                 StringBuilder appLaunchOuput = new StringBuilder();
@@ -515,6 +525,15 @@
                         String launchSplit[] = line.split(":");
                         launchTime = launchSplit[1].trim();
                     }
+                    // Needed to update the component name if the very first launch activity
+                    // is different from hot launch activity (i.e YouTube)
+                    if ((launchSuccess && (mLaunchMode.contains(HOT_LAUNCH) ||
+                            mLaunchMode.contains(NOT_SURE)) && lineCount == 4)) {
+                        String activitySplit[] = line.split(":");
+                        if (activitySplit[0].contains(ACTIVITY)) {
+                            mCmpName = activitySplit[1].trim();
+                        }
+                    }
                     lineCount++;
                 }
                 inputStream.close();
@@ -555,11 +574,16 @@
      * @param appName
      * @param appLaunchTime
      */
-    private void updateResult(String appName,long appLaunchTime){
+    private void updateResult(String appName, long appLaunchTime) {
         if (appLaunchTime != ILauncherStrategy.LAUNCH_FAILED_TIMESTAMP) {
             // Component name needed for parsing the events log
-            mResult.putString(appName, mAppLaunchIntentsMapping.get(appName).
-                    getComponent().flattenToShortString());
+            if (null != mComponentName) {
+                mResult.putString(appName, mComponentName);
+            } else {
+                // Component name needed for parsing the events log
+                mResult.putString(appName, mAppLaunchIntentsMapping.get(appName).
+                        getComponent().flattenToShortString());
+            }
         } else {
             mResult.putString(appName, NOT_SUCCESSFUL_MESSAGE);
         }