commit e1947a404e71079a5eb0153624e899747039c7fa
author Dipankar Bhardwaj <dipankarb@google.com> Thu Apr 27 19:02:10 2023 +0000
committer Dipankar Bhardwaj <dipankarb@google.com> Thu Apr 27 19:02:10 2023 +0000
tree 18bd0305138713dccdbe34695efeefafeb0d52a6
parent 46c450a66b574d3879c2522fb1f79f2e164ec452

Enabling get content takeover for Android T+

Test: atest MediaProviderTests
Bug: 262503735
Change-Id: Ic369b1f38bf65d656c8e24fc2653edb2c4cd1f1c

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 6e841af..06c98d2 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1356,8 +1356,13 @@
 
     @VisibleForTesting
     protected void storageNativeBootPropertyChangeListener() {
-        setComponentEnabledSetting("PhotoPickerGetContentActivity",
-                mConfigStore.isGetContentTakeOverEnabled());
+        boolean isGetContentTakeoverEnabled;
+        if (SdkLevel.isAtLeastT()) {
+            isGetContentTakeoverEnabled = true;
+        } else {
+            isGetContentTakeoverEnabled = mConfigStore.isGetContentTakeOverEnabled();
+        }
+        setComponentEnabledSetting("PhotoPickerGetContentActivity", isGetContentTakeoverEnabled);
 
         setComponentEnabledSetting("PhotoPickerUserSelectActivity",
                 mConfigStore.isUserSelectForAppEnabled());