Use new API for shouldBypass
Changed the code to use getRequestRawExternalStorageAccess.
Bug: 185484514
Test: atest packages/providers/MediaProvider
Change-Id: I60b8e79e3eae333f7dc4c56ae561c08f29010f6a
diff --git a/src/com/android/providers/media/LocalCallingIdentity.java b/src/com/android/providers/media/LocalCallingIdentity.java
index 97a33e3..b684091 100644
--- a/src/com/android/providers/media/LocalCallingIdentity.java
+++ b/src/com/android/providers/media/LocalCallingIdentity.java
@@ -394,9 +394,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.