diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-15 00:11:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-15 00:11:43 +0000 |
| commit | 0417872bf7f970998d90b11c3dcee71876532a7f (patch) | |
| tree | ff9085bbdf562c2dc704ce9d252cc7e4b8cd3655 | |
| parent | 89ddda27904603962ee2fcb4e07112b303d44f67 (diff) | |
| parent | 80dd1abacb5f08f8022e43ef5465c407169e9fd5 (diff) | |
| download | Contacts-0417872bf7f970998d90b11c3dcee71876532a7f.tar.gz | |
Merge cherrypicks of [15831545, 15831526, 15831634, 15831684, 15831293, 15831546, 15831847, 15831808, 15831638, 15831639, 15831558, 15831793, 15831794, 15831795, 15831796, 15831797, 15831798, 15831799, 15831800, 15831801, 15831802, 15831803, 15831804, 15831640, 15831849, 15831810, 15831811, 15831850, 15831641, 15831805, 15831812, 15831642, 15831813, 15831851, 15831852, 15831887, 15831888, 15831559, 15831814, 15831815, 15831853, 15831854, 15831855, 15831315] into sc-releaseandroid-platform-12.0.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r11android-12.0.0_r10android12-s2-releaseandroid12-release
Change-Id: Ia23803d11a2b76b24b4547e54f661cb42a6b32fb
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a5b25debd..32d6644a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -495,6 +495,7 @@ <activity android:name=".vcard.NfcImportVCardActivity" + android:permission="android.permission.DISPATCH_NFC_MESSAGE" android:configChanges="orientation|screenSize|keyboardHidden" android:exported="true" android:theme="@style/BackgroundOnlyTheme"> |