Merge "Require usage information for runtime permissions" (6ad12e57) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+46 −23

Original line number	Diff line number	Diff line
		@@ -655,7 +655,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readContacts"
		android:description="@string/permdesc_readContacts"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to write the user's contacts data.
		<p>Protection level: dangerous
		@@ -686,7 +687,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readCalendar"
		android:description="@string/permdesc_readCalendar"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to write the user's calendar data.
		<p>Protection level: dangerous
		@@ -727,7 +729,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_receiveSms"
		android:description="@string/permdesc_receiveSms"
		android:protectionLevel="dangerous"/>
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to read SMS messages.
		<p>Protection level: dangerous
		@@ -736,7 +739,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readSms"
		android:description="@string/permdesc_readSms"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to receive WAP push messages.
		<p>Protection level: dangerous
		@@ -745,7 +749,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_receiveWapPush"
		android:description="@string/permdesc_receiveWapPush"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to monitor incoming MMS messages.
		<p>Protection level: dangerous
		@@ -754,7 +759,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_receiveMms"
		android:description="@string/permdesc_receiveMms"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- @SystemApi @TestApi Allows an application to read previously received cell broadcast
		messages and to register a content observer to get notifications when
		@@ -772,7 +778,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readCellBroadcasts"
		android:description="@string/permdesc_readCellBroadcasts"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing external storage -->
		@@ -853,7 +860,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_audioRead"
		android:description="@string/permdesc_audioRead"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Runtime permission controlling access to the user's shared visual media
		collection, including images and videos. -->
		@@ -869,14 +877,16 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_imagesRead"
		android:description="@string/permdesc_imagesRead"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to read the user's shared video collection. -->
		<permission android:name="android.permission.READ_MEDIA_VIDEO"
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_videoRead"
		android:description="@string/permdesc_videoRead"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to access any geographic locations persisted in the
		user's shared collection. -->
		@@ -884,7 +894,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_mediaLocation"
		android:description="@string/permdesc_mediaLocation"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- @hide @SystemApi
		Allows an application to modify OBB files visible to other apps. -->
		@@ -916,7 +927,8 @@
		android:label="@string/permlab_accessFineLocation"
		android:description="@string/permdesc_accessFineLocation"
		android:backgroundPermission="android.permission.ACCESS_BACKGROUND_LOCATION"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- Allows an app to access approximate location.
		Alternatively, you might want {@link #ACCESS_FINE_LOCATION}.
		@@ -927,7 +939,8 @@
		android:label="@string/permlab_accessCoarseLocation"
		android:description="@string/permdesc_accessCoarseLocation"
		android:backgroundPermission="android.permission.ACCESS_BACKGROUND_LOCATION"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- Allows an app to access location in the background. If you
		are requesting this, you should also request {@link #ACCESS_FINE_LOCATION}.
		@@ -939,7 +952,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_accessBackgroundLocation"
		android:description="@string/permdesc_accessBackgroundLocation"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the call log -->
		@@ -980,7 +994,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readCallLog"
		android:description="@string/permdesc_readCallLog"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an application to write (but not read) the user's
		call log data.
		@@ -1010,7 +1025,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_processOutgoingCalls"
		android:description="@string/permdesc_processOutgoingCalls"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the device telephony -->
		@@ -1042,7 +1058,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readPhoneState"
		android:description="@string/permdesc_readPhoneState"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows read access to the device's phone number(s). This is a subset of the capabilities
		granted by {@link #READ_PHONE_STATE} but is exposed to instant applications.
		@@ -1051,7 +1068,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_readPhoneNumbers"
		android:description="@string/permdesc_readPhoneNumbers"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- Allows an application to initiate a phone call without going through
		the Dialer user interface for the user to confirm the call.
		@@ -1141,7 +1159,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_recordAudio"
		android:description="@string/permdesc_recordAudio"
		android:protectionLevel="dangerous\|instant"/>
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- ====================================================================== -->
		<!-- Permissions for activity recognition -->
		@@ -1163,7 +1182,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_activityRecognition"
		android:description="@string/permdesc_activityRecognition"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the UCE Service -->
		@@ -1212,7 +1232,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_camera"
		android:description="@string/permdesc_camera"
		android:protectionLevel="dangerous\|instant" />
		android:protectionLevel="dangerous\|instant"
		android:usageInfoRequired="true" />


		<!-- ====================================================================== -->
		@@ -1236,7 +1257,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_bodySensors"
		android:description="@string/permdesc_bodySensors"
		android:protectionLevel="dangerous" />
		android:protectionLevel="dangerous"
		android:usageInfoRequired="true" />

		<!-- Allows an app to use fingerprint hardware.
		<p>Protection level: normal
		@@ -1723,7 +1745,8 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:protectionLevel="dangerous"
		android:description="@string/permdesc_getAccounts"
		android:label="@string/permlab_getAccounts" />
		android:label="@string/permlab_getAccounts"
		android:usageInfoRequired="true" />
		<uses-permission android:name="android.permission.GET_ACCOUNTS"/>

		<!-- @SystemApi Allows applications to call into AccountAuthenticators.