commit 799669a8c690dab217437082e023338d6c484048
author Abhilasha Chahal <abhichahal@google.com> Tue Jun 29 17:46:23 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 29 17:46:23 2021 +0000
tree 0e1536fade6e90b3f35d400cf7b9eae6194e1553
parent 0f343d3b64e6d88f7104671434b9f00ad0749355
parent 2627312f996e1ca841382c951bb02a4a631aa219

Merge "Guard old way of cloning app for S+ versions" into sc-dev

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index b2f6e8c..b29b3d7 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1312,14 +1312,18 @@
         try {
             UserHandle user1 = UserHandle.of(userId1);
             UserHandle user2 = UserHandle.of(userId2);
-
-            if (SdkLevel.isAtLeastS() && (mUserCache.userSharesMediaWithParent(user1)
+            if (Build.VERSION.DEVICE_INITIAL_SDK_INT < Build.VERSION_CODES.S) {
+                if (SdkLevel.isAtLeastS() && (mUserCache.userSharesMediaWithParent(user1)
                     || mUserCache.userSharesMediaWithParent(user2))) {
-                return true;
-            }
-            Method isAppCloneUserPair = StorageManager.class.getMethod("isAppCloneUserPair",
+                    return true;
+                }
+                Method isAppCloneUserPair = StorageManager.class.getMethod("isAppCloneUserPair",
                     int.class, int.class);
-            return (Boolean) isAppCloneUserPair.invoke(mStorageManager, userId1, userId2);
+                return (Boolean) isAppCloneUserPair.invoke(mStorageManager, userId1, userId2);
+            } else {
+                return (mUserCache.userSharesMediaWithParent(user1)
+                    || mUserCache.userSharesMediaWithParent(user2));
+            }
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             Log.w(TAG, "isAppCloneUserPair failed. Users: " + userId1 + " and " + userId2);
             return false;