commit 7df4a09dcb590ae5b279409dac6cee70520f8f70
author Sudheer Shanka <sudheersai@google.com> Mon Aug 19 18:05:23 2019 -0700
committer Sudheer Shanka <sudheersai@google.com> Wed Aug 21 23:17:25 2019 +0000
tree 600f264660a8d98abeb80542a0e4ff70ab39ce40
parent d8e849bb481613a06cea3f0010d0f9ae91ee52af

Don't try creating files outside pkg-owned dirs on secondary storage.

Fixes: 138916427
Fixes: 138688684
Test: setup virtual disk, mark it as portable and run
  atest hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java

Exempt-From-Owner-Approval: owners file is stale

Change-Id: If5947a99d22aae18be7bf0350e25be9eeb05bfc1

hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java

diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
index 753977b..be8b785 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
@@ -169,13 +169,11 @@
 
     public static List<File> getAllPackageSpecificObbGiftPaths(Context context,
             String targetPackageName) {
-        final File[] files = context.getObbDirs();
         final List<File> targetFiles = new ArrayList<>();
-        for (File file : files) {
-            final File targetFile = new File(
-                    file.getAbsolutePath().replace(context.getPackageName(), targetPackageName));
-            targetFiles.add(new File(targetFile, targetPackageName + ".gift"));
-        }
+        final File obbDir = context.getObbDir();
+        final File targetObbDir = new File(
+                obbDir.getAbsolutePath().replace(context.getPackageName(), targetPackageName));
+        targetFiles.add(new File(targetObbDir, targetPackageName + ".gift"));
         return targetFiles;
     }