| commit | a9d7d78af16a21c2f77ccb2c3f02fac49a4290f4 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Nov 02 21:07:54 2021 -0700 |
| committer | Bill Yi <byi@google.com> | Tue Nov 02 21:07:54 2021 -0700 |
| tree | 13842b021b148664f5f84b248c854d8c7d8c7954 | |
| parent | 3e5de5b676d330b78e620bd1dddc2bc951dfdd20 [diff] | |
| parent | 0417872bf7f970998d90b11c3dcee71876532a7f [diff] |
Merge SP1A.211105.004 to aosp-master - DO NOT MERGE Merged-In: If6bec622f8a151011d81d0c0b158892a91be365d Merged-In: Ia0a860b5945c952ab830254d1f5fb12944f3d10a Change-Id: Ie3bcacaaa7dd8641450623ef245a7712c45d4b17
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a61760..e5dfca8 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">