Move multi-user OBB under user-specific path.

Bug: 7212801
Change-Id: I0ab83c1d9cb21914d61a7da45a32e89956e22ec8

1 files changed, 1 insertions, 4 deletions

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 364004b2bee0..5c4c036e937c 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -109,8 +109,6 @@ public class Environment {
 
                 // /storage/emulated/0
                 mExternalStorage = buildPath(emulatedBase, rawUserId);
-                // /storage/emulated/obb
-                mExternalStorageAndroidObb = buildPath(emulatedBase, "obb");
                 // /data/media/0
                 mMediaStorage = buildPath(mediaBase, rawUserId);
 
@@ -123,12 +121,11 @@ public class Environment {
 
                 // /storage/sdcard0
                 mExternalStorage = new File(rawExternalStorage);
-                // /storage/sdcard0/Android/obb
-                mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
                 // /data/media
                 mMediaStorage = new File(rawMediaStorage);
             }
 
+            mExternalStorageAndroidObb = buildPath(mExternalStorage, DIRECTORY_ANDROID, "obb");
             mExternalStorageAndroidData = buildPath(mExternalStorage, DIRECTORY_ANDROID, "data");
             mExternalStorageAndroidMedia = buildPath(mExternalStorage, DIRECTORY_ANDROID, "media");
         }