Merge pull request #986 from lianglixin/patch-1

Fix Android 11 broken obb

Author: tiann

VirtualApp/lib/src/main/java/com/lody/virtual/client/VClientImpl.java

@@ -484,7 +484,8 @@ private void startIOUniformer() {
     private void setupVirtualStorage(ApplicationInfo info, int userId) {
         VirtualStorageManager vsManager = VirtualStorageManager.get();
         boolean enable = vsManager.isVirtualStorageEnable(info.packageName, userId);
-        if (!enable) {
+        // Android 11, force enable storage redirect.
+        if (!enable && !(Build.VERSION.SDK_INT >= 30)) {
             // There are lots of situation to deal, I am tired, disable it now.
             // such as: FileProvider.
             return;
@@ -507,7 +508,11 @@ private void setupVirtualStorage(ApplicationInfo info, int userId) {
         whiteList.add(Environment.DIRECTORY_MOVIES);
         whiteList.add(Environment.DIRECTORY_DOWNLOADS);
         whiteList.add(Environment.DIRECTORY_DCIM);
-        whiteList.add("Android/obb");
+        // Android 11, do not tryna fetch this directory directly or crash.
+        // See docs below...
+        if (Build.VERSION.SDK_INT < 30) {
+            whiteList.add("Android/obb");
+        }
         if (Build.VERSION.SDK_INT >= 19) {
             whiteList.add(Environment.DIRECTORY_DOCUMENTS);
         }
@@ -535,8 +540,13 @@ private void setupVirtualStorage(ApplicationInfo info, int userId) {
                 NativeEngine.whitelist(whitePath, true);
             }
 
+            // Android 11 -> see https://developer.android.com/training/data-storage#scoped-storage
+            // 安卓11 打开这个链接看看 https://developer.android.google.cn/training/data-storage#scoped-storage
+            // see https://android-opengrok.bangnimang.net/android-11.0.0_r8/xref/frameworks/base/core/java/android/os/Environment.java
             // redirect xxx/Android/data/ -> /xxx/Android/data/<host>/virtual/<user>
             NativeEngine.redirectDirectory(new File(storageRoot, "Android/data/").getAbsolutePath(), privatePath);
+            // redirect xxx/Android/obb/ -> /xxx/Android/data/<host>/virtual/<user>
+            NativeEngine.redirectDirectory(new File(storageRoot, "Android/obb/").getAbsolutePath(), privatePath);
             // redirect /sdcard/ -> vsdcard
             NativeEngine.redirectDirectory(storageRoot, vsPath);
         }
@@ -547,6 +557,9 @@ private HashSet<String> getMountPoints() {
         HashSet<String> mountPoints = new HashSet<>(3);
         mountPoints.add("/mnt/sdcard/");
         mountPoints.add("/sdcard/");
+        // Redmi 10X Pro, Pixel 5... More mount points?
+        // [email protected]
+        mountPoints.add("/storage/self/primary/");
         String[] points = StorageManagerCompat.getAllPoints(VirtualCore.get().getContext());
         if (points != null) {
             Collections.addAll(mountPoints, points);