diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-11 03:43:12 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-11 03:43:12 +0000 |
commit | 3be1edb2f766a8e44c61bd9e1448f0ea06a4afb6 (patch) | |
tree | 6d4441b30d17f71f91b94435f32207bf6521289f | |
parent | 041a95679a085504419dd03e568b8fde8d994cda (diff) | |
parent | 4d6c1e48a5002094127f04f5818e0b5bab43153e (diff) | |
download | base-3be1edb2f766a8e44c61bd9e1448f0ea06a4afb6.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22994099'] into sparse-10102984-L51900000960588890.
SPARSE_CHANGE: Ie5c6e8dbc69001478af78923b02bcca7777ed6b1
Change-Id: Id05051dd96bd240e47cb0e195446879a40915bea
-rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 11 |
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> |