Update language in system/timezone to comply with Android’s inclusive language guidance am: fdc5399eb1 am: 6ac9af6f5a
Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1372805
Change-Id: I3cd8b6357c5c29b67af99ec32fe95bfa02c9396b
diff --git a/apex/Android.bp b/apex/Android.bp
index 1f598a5..1ff0743 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,8 +16,7 @@
apex_defaults {
name: "com.android.tzdata-defaults",
updatable: true,
- // tzdata apex is tied to dessert release
- min_sdk_version: "current",
+ min_sdk_version: "R",
// Use a custom AndroidManifest.xml used for API targeting.
androidManifest: ":com.android.tzdata-androidManifest",
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index bcd0383..d7c9632 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -23,9 +23,11 @@
* the version of ICU being used on the device. Since that typically
* updates every dessert release, we lock the module to a single API level.
-->
- <uses-sdk
+ <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->
+ <!--uses-sdk
android:minSdkVersion="29"
android:maxSdkVersion="29"
android:targetSdkVersion="29"
/>
+ -->
</manifest>
diff --git a/apex/manifest.json b/apex/manifest.json
index 52a428b..c1bdf6a 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.tzdata",
- "version": 299900000
+ "version": 300000000
}