mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-03 10:02:28 +00:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
27 lines
967 B
Diff
27 lines
967 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: John Shao <johnshao@google.com>
|
|
Date: Wed, 25 Aug 2021 23:29:56 +0000
|
|
Subject: [PATCH] Add permission to start NFC activity to ensure it is from NFC
|
|
stack
|
|
|
|
Bug: 191053931
|
|
Test: build
|
|
Change-Id: I41b5ddf464f45e68a4da6ad880cbc9b12e447ec5
|
|
(cherry picked from commit 024c62fa49aa2090daf50657c2b509b9478d8b92)
|
|
---
|
|
AndroidManifest.xml | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
|
index b3f789852..c0c87c192 100755
|
|
--- a/AndroidManifest.xml
|
|
+++ b/AndroidManifest.xml
|
|
@@ -468,6 +468,7 @@
|
|
</activity>
|
|
|
|
<activity android:name=".common.vcard.NfcImportVCardActivity"
|
|
+ android:permission="android.permission.DISPATCH_NFC_MESSAGE"
|
|
android:label="@string/launcherActivityLabel"
|
|
android:configChanges="orientation|screenSize|keyboardHidden"
|
|
android:theme="@style/BackgroundOnlyTheme">
|