Merge "Merge cherrypicks of [1950296, 1960919] into sparse-8113417-L91700000952783468." into sparse-8113417-L91700000952783468sparse-8121823-L60500000952882506

3 files changed, 2 insertions, 127 deletions

diff --git a/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java b/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
index a7560049aea..e959abdc636 100644
--- a/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
+++ b/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
@@ -45,8 +45,6 @@ public class IncidentdTest extends ProtoDumpTestCase {
 
         DiskStatsProtoTest.verifyDiskStatsServiceDumpProto(dump.getDiskstats(), filterLevel, getDevice());
 
-        PackageIncidentTest.verifyPackageServiceDumpProto(dump.getPackage(), filterLevel);
-
         PowerIncidentTest.verifyPowerManagerServiceDumpProto(dump.getPower(), filterLevel);
 
         if (PrintProtoTest.supportsPrinting(getDevice())) {
diff --git a/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java
deleted file mode 100644
index 66137c12f2a..00000000000
--- a/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 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.server.cts;
-
-import android.service.pm.PackageProto;
-import android.service.pm.PackageProto.UserInfoProto;
-import android.service.pm.PackageServiceDumpProto;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/** Test for "dumpsys package --proto" */
-public class PackageIncidentTest extends ProtoDumpTestCase {
-    // Use the test apk from the BatteryStatsIncidentTest
-    private static final String DEVICE_SIDE_TEST_APK = "CtsBatteryStatsApp.apk";
-    private static final String DEVICE_SIDE_TEST_PACKAGE = "com.android.server.cts.device.batterystats";
-
-    @Override
-    protected void tearDown() throws Exception {
-        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
-
-        super.tearDown();
-    }
-
-    private static void assertPositive(String name, long value) {
-        if (value > 0) return;
-        fail(name + " expected to be positive, but was: " + value);
-    }
-
-    private static void assertNotNegative(String name, long value) {
-        if (value >= 0) return;
-        fail(name + " expected to be zero or positive, but was: " + value);
-    }
-
-    /** Parse the output of "dumpsys package --proto" and make sure the values are probable. */
-    public void testPackageServiceDump() throws Exception {
-        final long st = System.currentTimeMillis();
-
-        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
-
-        // Find the package UID, version code, and version string.
-        final Matcher matcher =
-                execCommandAndFind(
-                        "dumpsys package " + DEVICE_SIDE_TEST_PACKAGE,
-                        "userId=(\\d+).*versionCode=(\\d+).*versionName=([^\\n]*)",
-                        Pattern.DOTALL);
-        final int uid = Integer.parseInt(matcher.group(1));
-        final int versionCode = Integer.parseInt(matcher.group(2));
-        final String versionString = matcher.group(3).trim();
-
-        final PackageServiceDumpProto dump =
-                getDump(PackageServiceDumpProto.parser(), "dumpsys package --proto");
-
-        PackageProto testPackage = null;
-        for (PackageProto pkg : dump.getPackagesList()) {
-            if (pkg.getName().equals(DEVICE_SIDE_TEST_PACKAGE)) {
-                testPackage = pkg;
-                break;
-            }
-        }
-
-        assertNotNull(testPackage);
-        assertEquals(testPackage.getName(), DEVICE_SIDE_TEST_PACKAGE);
-        assertEquals(testPackage.getUid(), uid);
-        assertEquals(testPackage.getVersionCode(), versionCode);
-        assertEquals(testPackage.getVersionString(), versionString);
-        assertPositive("install_time_ms", testPackage.getInstallTimeMs());
-        assertEquals(testPackage.getInstallTimeMs(), testPackage.getUpdateTimeMs());
-        assertEquals(testPackage.getSplits(0).getName(), "base");
-        assertEquals(testPackage.getSplits(0).getRevisionCode(), 0);
-        assertNotNull(testPackage.getUserPermissionsList());
-
-        UserInfoProto testUser = testPackage.getUsers(0);
-        assertEquals(testUser.getId(), 0);
-        assertEquals(testUser.getInstallType(),
-                PackageProto.UserInfoProto.InstallType.FULL_APP_INSTALL);
-        assertFalse(testUser.getIsHidden());
-        assertFalse(testUser.getIsLaunched());
-        assertFalse(testUser.getEnabledState() == PackageProto.UserInfoProto
-                .EnabledState.COMPONENT_ENABLED_STATE_DISABLED_USER);
-
-        verifyPackageServiceDumpProto(dump, PRIVACY_NONE);
-    }
-
-    static void verifyPackageServiceDumpProto(PackageServiceDumpProto dump, final int filterLevel) throws Exception {
-        assertNotNull(dump.getVerifierPackage().getName());
-        assertNotNull(dump.getSharedLibraries(0).getName());
-        if (dump.getSharedLibraries(0).getIsJar()) {
-            assertNotNull(dump.getSharedLibraries(0).getPath());
-        } else {
-            assertNotNull(dump.getSharedLibraries(0).getApk());
-        }
-        assertNotNull(dump.getFeatures(0).getName());
-
-        PackageServiceDumpProto.SharedUserProto systemUser = null;
-        for (PackageServiceDumpProto.SharedUserProto user : dump.getSharedUsersList()) {
-            if (user.getUid() == 1000) {
-                systemUser = user;
-                break;
-            }
-        }
-        assertNotNull(systemUser);
-        assertEquals("android.uid.system", systemUser.getName());
-
-        if (filterLevel == PRIVACY_AUTO) {
-            for (String msg : dump.getMessagesList()) {
-                assertTrue(msg.isEmpty());
-            }
-        }
-    }
-}
diff --git a/tests/tests/media/src/android/media/cts/SystemMediaRouter2Test.java b/tests/tests/media/src/android/media/cts/SystemMediaRouter2Test.java
index c3399170f0a..3623f155497 100644
--- a/tests/tests/media/src/android/media/cts/SystemMediaRouter2Test.java
+++ b/tests/tests/media/src/android/media/cts/SystemMediaRouter2Test.java
@@ -112,7 +112,8 @@ public class SystemMediaRouter2Test {
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getTargetContext();
         mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
-        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.MEDIA_CONTENT_CONTROL);
+        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.MEDIA_CONTENT_CONTROL,
+                                                   Manifest.permission.QUERY_AUDIO_STATE);
 
         mExecutor = Executors.newSingleThreadExecutor();
         mAudioManager = (AudioManager) mContext.getSystemService(AUDIO_SERVICE);