commit 6ea68b8d91dffd22d092d3d79a9af38fe6370be0
author Andreas Gampe <agampe@google.com> Wed Aug 29 09:53:39 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 29 09:53:39 2018 -0700
tree 2ad18ef8541a3377f2e72e508d5392a12c8bf68a
parent 843b326bd2c1259daa5158125fa8448b496665de
parent caa1bbd22125ed3eae9c4a8c7de98fd87aa655ef

Tradefed: Attempt to use list -a for getPackagesToSet
am: caa1bbd221

Change-Id: If88f39fe5c0dcdbc726d2e58540c5283c918278c

src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java

diff --git a/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java b/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java
index d3d3b98..b2ebb52 100644
--- a/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java
+++ b/src/com/android/tradefed/targetprep/SetPackagesRecentlyUsed.java
@@ -69,7 +69,17 @@
 
     private List<String> getPackagesToSet(ITestDevice device) throws DeviceNotAvailableException {
         if (mPackages.isEmpty()) {
-            String[] packages = device.executeShellCommand("cmd package list package").split("\n");
+            String packageString;
+            try {
+                String res = device.executeShellCommand("cmd package list package -a");
+                if (res == null || res.contains("Error: Unknown option: -a")) {
+                    throw new RuntimeException();
+                }
+                packageString = res;
+            } catch (RuntimeException e) {
+                packageString = device.executeShellCommand("cmd package list package");
+            }
+            String[] packages = packageString.split("\n");
             return Arrays.asList(packages);
         } else {
             return mPackages;