Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b69a4ed2 authored Sep 05, 2024 by Roshan Pius

[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC...

[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3254877




Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merged-In: Id0233a614491173d48f6111fd0ef4bd9ce50d4a9
Change-Id: I970c29974712e3aab744cd7bd21411217ae64881

parents 952d275c 03c81cdc

data/etc/privapp-permissions-platform.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -580,6 +580,8 @@ applications that come with the platform
		<permission name="android.permission.PREPARE_FACTORY_RESET" />
		<!-- Permission required for CTS test - FileIntegrityManagerTest -->
		<permission name="android.permission.SETUP_FSVERITY" />
		<!-- Permission required for CTS test - CtsNfcTestCases -->
		<permission name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />
		</privapp-permissions>

		<privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -941,6 +941,9 @@
		<!-- Permission required for CTS test - FileIntegrityManagerTest -->
		<uses-permission android:name="android.permission.SETUP_FSVERITY" />

		<!-- Permission required for CTS test - CtsNfcTestCases -->
		<uses-permission android:name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />

		<application
		android:label="@string/app_label"
		android:theme="@android:style/Theme.DeviceDefault.DayNight"