Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef66c6fc authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am a5e1d21f: Merge into jb-mr1-dev 

* commit 'a5e1d21f':
  Move multi-user OBB under user-specific path.
parents 51a05208 a5e1d21f

core/java/android/os/Environment.java

+1 −4
Original line number Diff line number Diff line
@@ -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");

        }