Rewrite how we abandon sessions

The original code is flawed in that `pm install-abandon` only abandons
the 1st session returned by `pm get-stagedsessions ...`.

1. move AbandonSessionsRule to be shared by multiple host tests
2. use AbandonSessionsRule to do the job

Bug: 160754072
Test: StagedInstallInternalTest
Change-Id: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
Merged-In: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
(cherry picked from commit 3ac333f2d20e240093235d957ba67ce174fe2db8)

2 files changed, 7 insertions, 64 deletions

diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp
index 2be4ae6bb214..a23df920b396 100644
--- a/tests/RollbackTest/Android.bp
+++ b/tests/RollbackTest/Android.bp
@@ -29,7 +29,12 @@ java_test_host {
     name: "StagedRollbackTest",
     srcs: ["StagedRollbackTest/src/**/*.java"],
     libs: ["tradefed"],
-    static_libs: ["testng", "compatibility-tradefed", "RollbackTestLib"],
+    static_libs: [
+        "compatibility-tradefed",
+        "frameworks-base-hostutils",
+        "RollbackTestLib",
+        "testng",
+    ],
     test_suites: ["general-tests"],
     test_config: "StagedRollbackTest.xml",
     data: [":com.android.apex.apkrollback.test_v1"],
@@ -39,7 +44,7 @@ java_test_host {
     name: "NetworkStagedRollbackTest",
     srcs: ["NetworkStagedRollbackTest/src/**/*.java"],
     libs: ["tradefed"],
-    static_libs: ["RollbackTestLib"],
+    static_libs: ["RollbackTestLib", "frameworks-base-hostutils"],
     test_suites: ["general-tests"],
     test_config: "NetworkStagedRollbackTest.xml",
 }
diff --git a/tests/RollbackTest/lib/src/com/android/tests/rollback/host/AbandonSessionsRule.java b/tests/RollbackTest/lib/src/com/android/tests/rollback/host/AbandonSessionsRule.java
deleted file mode 100644
index b08621314ee0..000000000000
--- a/tests/RollbackTest/lib/src/com/android/tests/rollback/host/AbandonSessionsRule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.tests.rollback.host;
-
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-
-import org.junit.rules.ExternalResource;
-
-public class AbandonSessionsRule extends ExternalResource {
-    private final BaseHostJUnit4Test mHost;
-
-    public AbandonSessionsRule(BaseHostJUnit4Test host) {
-        mHost = host;
-    }
-
-    @Override
-    protected void before() throws Throwable {
-        abandonSessions(mHost.getDevice());
-    }
-
-    @Override
-    protected void after() {
-        try {
-            abandonSessions(mHost.getDevice());
-        } catch (Exception ignore) {
-        }
-    }
-
-    /**
-     * Abandons all sessions to prevent interference in our tests.
-     */
-    private static void abandonSessions(ITestDevice device) throws Exception {
-        // No point in abandoning applied or failed sessions. We care about ready sessions only.
-        String cmdListReadySessions =
-                "pm list staged-sessions --only-sessionid --only-parent --only-ready";
-        String output = device.executeShellCommand(cmdListReadySessions);
-        if (output.trim().isEmpty()) {
-            // No sessions to abandon
-            return;
-        }
-        // Ensure we have sufficient privilege to abandon sessions from other apps
-        device.enableAdbRoot();
-        device.executeShellCommand("for i in $(" + cmdListReadySessions
-                + "); do pm install-abandon $i; done");
-        device.disableAdbRoot();
-    }
-}