summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-15 02:05:57 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-15 02:05:57 +0000
commit58f36f04691784e1c9bdc05d9bd888bc15e66d36 (patch)
tree6d4441b30d17f71f91b94435f32207bf6521289f
parentde76d562192ea687eab9ec7e40ee8cbd93ab36ed (diff)
parent5b4d8e9cdabffd49d30d335d42d329e6f2eed618 (diff)
downloadbase-android13-qpr3-c-s3-release.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22994099'] into tm-qpr3-c-release.android-13.0.0_r60android13-qpr3-c-s3-release
Change-Id: I238cbbc0a63e8c282d79e50a22c394cd9dc039ef
-rw-r--r--packages/SystemUI/AndroidManifest.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 5c369afc1fcd..59be7a895157 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -1011,5 +1011,16 @@
android:exported="true"
android:permission="android.permission.CUSTOMIZE_SYSTEM_UI"
/>
+
+ <!-- TODO(b/278897602): Disable EmojiCompatInitializer until threading issues are fixed.
+ https://developer.android.com/reference/androidx/emoji2/text/EmojiCompatInitializer -->
+ <provider
+ android:name="androidx.startup.InitializationProvider"
+ android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
+ tools:node="merge">
+ <meta-data android:name="androidx.emoji2.text.EmojiCompatInitializer"
+ tools:node="remove" />
+ </provider>
</application>
</manifest>