commit 8ab563a7a741589a4bed2bfe31c1b1e2f1bc71ff
author Sahana Rao <sahanas@google.com> Tue May 04 19:19:17 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 04 19:19:17 2021 +0000
tree 3002b35d12a0b42ee5d450e10a22ad435899d2a3
parent b12718cfb4f4f1ebdbf5c1bdda25e47838f85dc4
parent 279bb86478d0b8f33694a366b2b137567b939cec

Merge "Use new API for shouldBypass" into sc-dev

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

diff --git a/src/com/android/providers/media/LocalCallingIdentity.java b/src/com/android/providers/media/LocalCallingIdentity.java
index 868f34d..d19627c 100644
--- a/src/com/android/providers/media/LocalCallingIdentity.java
+++ b/src/com/android/providers/media/LocalCallingIdentity.java
@@ -420,9 +420,12 @@
             ai = context.getPackageManager()
                     .getApplicationInfo(getPackageName(), 0);
             if (ai != null) {
-                Boolean shouldBypass = ai.hasRequestRawExternalStorageAccess();
-                if (shouldBypass != null) {
-                    return shouldBypass;
+                final int requestRawExternalStorageValue
+                        = ai.getRequestRawExternalStorageAccess();
+                if (requestRawExternalStorageValue
+                        != ApplicationInfo.RAW_EXTERNAL_STORAGE_ACCESS_DEFAULT) {
+                    return requestRawExternalStorageValue
+                            == ApplicationInfo.RAW_EXTERNAL_STORAGE_ACCESS_REQUESTED;
                 }
                 // Manifest flag is not set, hence return default value based on the category of the
                 // app and targetSDK.