From 59b9da9907fba24239f235c4bc7185ffe086c66f Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Wed, 25 Mar 2020 15:28:39 -0700
Subject: [PATCH] Declare MANAGE_EXTERNAL_STORAGE for test apps.

That has requested legacy external storage and targets R or
beyond. TestDevice automatically grants the app op during test app
installation but the permission declaration should still be there.

Also added some other missing app op permission declarations according
to test failure.

Fixes: 149765004
Test: Ensure the same set of tests pass with the following command:
Test: atest ExternalStorageHostTest StorageHostTest
Test: Ensure apps printed in the following command targets below R:
Test: find . -type f -exec grep -q 'android:requestLegacyExternalStorage' {} \; -not -exec grep -q 'MANAGE_EXTERNAL_STORAGE' {} \; -print
Test: presubmit
Exempt-From-Owner-Approval: This CL just adds a <uses-permission> line
                            across a number of test apps. Storage team
                            and most owners have approved this change.
Change-Id: I839a23b28b29118baae7a8c309f7bd4de698419b
---
 tests/cts/hostside/app/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cts/hostside/app/AndroidManifest.xml b/tests/cts/hostside/app/AndroidManifest.xml
index 5ddad7c1c4..3940de4240 100644
--- a/tests/cts/hostside/app/AndroidManifest.xml
+++ b/tests/cts/hostside/app/AndroidManifest.xml
@@ -28,6 +28,7 @@
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
     <application android:requestLegacyExternalStorage="true" >
         <uses-library android:name="android.test.runner" />