summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Garvita Jain <garvitajain@google.com> 2025-03-05 05:55:58 +0000
committer Garvita Jain <garvitajain@google.com> 2025-03-05 08:37:01 +0000
commit30fa0dfc88fe06367631d1528a5790d70a218d9c (patch)
tree8bda69ec1a9f69bd54f264935ca0d3f09c55ba3f
parenta68f38c7fffe21304b79acda953160d0935654d4 (diff)
Use EnableAfter to check targetSdkVersion instead of EnabledSince
Build.VERSION_CODES.BAKLAVA is flagged right now. MTS is unable to recognize the flag. BUG: 400347834 Test: banchan com.google.android.mediaprovider mainline_modules_arm64 -> atest CtsScopedStorageDeviceOnlyTest Flag: EXEMPT bugfix Change-Id: Ic931d3c43629227bd5b5d6cd6068e8580cf525ae
-rw-r--r--photopicker/res/values-fa/feature_profiles_strings.xml2
-rw-r--r--src/com/android/providers/media/MediaProvider.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/photopicker/res/values-fa/feature_profiles_strings.xml b/photopicker/res/values-fa/feature_profiles_strings.xml
index 301bf4daf..47913d7d9 100644
--- a/photopicker/res/values-fa/feature_profiles_strings.xml
+++ b/photopicker/res/values-fa/feature_profiles_strings.xml
@@ -20,7 +20,7 @@
<string name="photopicker_profile_primary_label" msgid="4757455689901820680">"شخصی"</string>
<string name="photopicker_profile_managed_label" msgid="8223788467673917191">"کاری"</string>
<string name="photopicker_profile_unknown_label" msgid="4794151597112747338">"غیره"</string>
- <string name="photopicker_profile_switch_button_description" msgid="136797665427675773">"عوض کردن نمایه کاربر"</string>
+ <string name="photopicker_profile_switch_button_description" msgid="136797665427675773">"تعویض نمایه کاربر"</string>
<string name="photopicker_selected_profile_description" msgid="4038233039178326677">"‫<xliff:g id="PROFILE_NAME">%1$s</xliff:g> انتخاب شد"</string>
<string name="photopicker_profile_unavailable_dialog_title" msgid="1198925313401075806">"برنامه‌های <xliff:g id="PROFILE_NAME">%1$s</xliff:g> موقتاً متوقف شده است"</string>
<string name="photopicker_profile_blocked_by_admin_dialog_title" msgid="3210828020946868217">"سرپرست آن را مسدود کرده است"</string>
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 399826d6c..15d356deb 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -574,7 +574,7 @@ public class MediaProvider extends ContentProvider {
* Attempting to send more than 2000 uris will result in an IllegalArgumentException.
*/
@ChangeId
- @EnabledSince(targetSdkVersion = Build.VERSION_CODES.BAKLAVA)
+ @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)
static final long LIMIT_CREATE_REQUEST_URIS = 203408344L;
@GuardedBy("mPendingOpenInfo")