Merge "Fix issue #78230210: Strobe: Need separate runtime permission group for... (06defc2a) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -162,6 +162,7 @@ package android {
	public static final class Manifest.permission_group {		public static final class Manifest.permission_group {
	ctor public Manifest.permission_group();		ctor public Manifest.permission_group();
	field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";		field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
			field public static final java.lang.String CALL_LOG = "android.permission-group.CALL_LOG";
	field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";		field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
	field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";		field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
	field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";		field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";

core/res/AndroidManifest.xml

+71 −60

Original line number	Original line	Diff line number	Diff line
	@@ -840,56 +840,17 @@
	android:protectionLevel="dangerous\|instant" />		android:protectionLevel="dangerous\|instant" />

	<!-- ====================================================================== -->		<!-- ====================================================================== -->
	<!-- Permissions for accessing the device telephony -->		<!-- Permissions for accessing the call log -->
	<!-- ====================================================================== -->		<!-- ====================================================================== -->
	<eat-comment />		<eat-comment />

	<!-- Used for permissions that are associated telephony features. -->		<!-- Used for permissions that are associated telephony features. -->
	<permission-group android:name="android.permission-group.PHONE"		<permission-group android:name="android.permission-group.CALL_LOG"
	android:icon="@drawable/perm_group_phone_calls"		android:icon="@drawable/perm_group_phone_calls"
	android:label="@string/permgrouplab_phone"		android:label="@string/permgrouplab_calllog"
	android:description="@string/permgroupdesc_phone"		android:description="@string/permgroupdesc_calllog"
	android:request="@string/permgrouprequest_phone"		android:request="@string/permgrouprequest_calllog"
	android:priority="500" />		android:priority="450" />

	<!-- Allows read only access to phone state, including the phone number of the device,
	current cellular network information, the status of any ongoing calls, and a list of any
	{@link android.telecom.PhoneAccount}s registered on the device.
	<p class="note"><strong>Note:</strong> If <em>both</em> your <a
	href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
	minSdkVersion}</a> and <a
	href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
	targetSdkVersion}</a> values are set to 3 or lower, the system implicitly
	grants your app this permission. If you don't need this permission, be sure your <a
	href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
	targetSdkVersion}</a> is 4 or higher.
	<p>Protection level: dangerous
	-->
	<permission android:name="android.permission.READ_PHONE_STATE"
	android:permissionGroup="android.permission-group.PHONE"
	android:label="@string/permlab_readPhoneState"
	android:description="@string/permdesc_readPhoneState"
	android:protectionLevel="dangerous" />

	<!-- 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.
	<p>Protection level: dangerous-->
	<permission android:name="android.permission.READ_PHONE_NUMBERS"
	android:permissionGroup="android.permission-group.PHONE"
	android:label="@string/permlab_readPhoneNumbers"
	android:description="@string/permdesc_readPhoneNumbers"
	android:protectionLevel="dangerous\|instant" />

	<!-- Allows an application to initiate a phone call without going through
	the Dialer user interface for the user to confirm the call.
	<p>Protection level: dangerous
	-->
	<permission android:name="android.permission.CALL_PHONE"
	android:permissionGroup="android.permission-group.PHONE"
	android:permissionFlags="costsMoney"
	android:label="@string/permlab_callPhone"
	android:description="@string/permdesc_callPhone"
	android:protectionLevel="dangerous" />

	<!-- Allows an application to access the IMS call service: making and		<!-- Allows an application to access the IMS call service: making and
	modifying a call		modifying a call
	@@ -897,7 +858,6 @@
	@hide		@hide
	-->		-->
	<permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE"		<permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE"
	android:permissionGroup="android.permission-group.PHONE"
	android:label="@string/permlab_accessImsCallService"		android:label="@string/permlab_accessImsCallService"
	android:description="@string/permdesc_accessImsCallService"		android:description="@string/permdesc_accessImsCallService"
	android:protectionLevel="signature\|privileged" />		android:protectionLevel="signature\|privileged" />
	@@ -915,7 +875,7 @@
	<p>Protection level: dangerous		<p>Protection level: dangerous
	-->		-->
	<permission android:name="android.permission.READ_CALL_LOG"		<permission android:name="android.permission.READ_CALL_LOG"
	android:permissionGroup="android.permission-group.PHONE"		android:permissionGroup="android.permission-group.CALL_LOG"
	android:label="@string/permlab_readCallLog"		android:label="@string/permlab_readCallLog"
	android:description="@string/permdesc_readCallLog"		android:description="@string/permdesc_readCallLog"
	android:protectionLevel="dangerous" />		android:protectionLevel="dangerous" />
	@@ -934,11 +894,74 @@
	<p>Protection level: dangerous		<p>Protection level: dangerous
	-->		-->
	<permission android:name="android.permission.WRITE_CALL_LOG"		<permission android:name="android.permission.WRITE_CALL_LOG"
	android:permissionGroup="android.permission-group.PHONE"		android:permissionGroup="android.permission-group.CALL_LOG"
	android:label="@string/permlab_writeCallLog"		android:label="@string/permlab_writeCallLog"
	android:description="@string/permdesc_writeCallLog"		android:description="@string/permdesc_writeCallLog"
	android:protectionLevel="dangerous" />		android:protectionLevel="dangerous" />

			<!-- Allows an application to see the number being dialed during an outgoing
			call with the option to redirect the call to a different number or
			abort the call altogether.
			<p>Protection level: dangerous
			-->
			<permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
			android:permissionGroup="android.permission-group.CALL_LOG"
			android:label="@string/permlab_processOutgoingCalls"
			android:description="@string/permdesc_processOutgoingCalls"
			android:protectionLevel="dangerous" />

			<!-- ====================================================================== -->
			<!-- Permissions for accessing the device telephony -->
			<!-- ====================================================================== -->
			<eat-comment />

			<!-- Used for permissions that are associated telephony features. -->
			<permission-group android:name="android.permission-group.PHONE"
			android:icon="@drawable/perm_group_phone_calls"
			android:label="@string/permgrouplab_phone"
			android:description="@string/permgroupdesc_phone"
			android:request="@string/permgrouprequest_phone"
			android:priority="500" />

			<!-- Allows read only access to phone state, including the phone number of the device,
			current cellular network information, the status of any ongoing calls, and a list of any
			{@link android.telecom.PhoneAccount}s registered on the device.
			<p class="note"><strong>Note:</strong> If <em>both</em> your <a
			href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
			minSdkVersion}</a> and <a
			href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
			targetSdkVersion}</a> values are set to 3 or lower, the system implicitly
			grants your app this permission. If you don't need this permission, be sure your <a
			href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
			targetSdkVersion}</a> is 4 or higher.
			<p>Protection level: dangerous
			-->
			<permission android:name="android.permission.READ_PHONE_STATE"
			android:permissionGroup="android.permission-group.PHONE"
			android:label="@string/permlab_readPhoneState"
			android:description="@string/permdesc_readPhoneState"
			android:protectionLevel="dangerous" />

			<!-- 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.
			<p>Protection level: dangerous-->
			<permission android:name="android.permission.READ_PHONE_NUMBERS"
			android:permissionGroup="android.permission-group.PHONE"
			android:label="@string/permlab_readPhoneNumbers"
			android:description="@string/permdesc_readPhoneNumbers"
			android:protectionLevel="dangerous\|instant" />

			<!-- Allows an application to initiate a phone call without going through
			the Dialer user interface for the user to confirm the call.
			<p>Protection level: dangerous
			-->
			<permission android:name="android.permission.CALL_PHONE"
			android:permissionGroup="android.permission-group.PHONE"
			android:permissionFlags="costsMoney"
			android:label="@string/permlab_callPhone"
			android:description="@string/permdesc_callPhone"
			android:protectionLevel="dangerous" />

	<!-- Allows an application to add voicemails into the system.		<!-- Allows an application to add voicemails into the system.
	<p>Protection level: dangerous		<p>Protection level: dangerous
	-->		-->
	@@ -957,18 +980,6 @@
	android:label="@string/permlab_use_sip"		android:label="@string/permlab_use_sip"
	android:protectionLevel="dangerous"/>		android:protectionLevel="dangerous"/>

	<!-- Allows an application to see the number being dialed during an outgoing
	call with the option to redirect the call to a different number or
	abort the call altogether.
	<p>Protection level: dangerous
	-->
	<permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
	android:permissionGroup="android.permission-group.PHONE"
	android:label="@string/permlab_processOutgoingCalls"
	android:description="@string/permdesc_processOutgoingCalls"
	android:protectionLevel="dangerous" />


	<!-- Allows the app to answer an incoming phone call.		<!-- Allows the app to answer an incoming phone call.
	<p>Protection level: dangerous		<p>Protection level: dangerous
	-->		-->

core/res/res/values/strings.xml

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -723,6 +723,14 @@
	<string name="permgrouprequest_camera">Allow		<string name="permgrouprequest_camera">Allow
	<b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to take pictures and record video?</string>		<b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to take pictures and record video?</string>

			<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
			<string name="permgrouplab_calllog">Call logs</string>
			<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
			<string name="permgroupdesc_calllog">read and write phone call log</string>
			<!-- Message shown to the user when the apps requests permission from this group -->
			<string name="permgrouprequest_calllog">Allow
			<b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to access your phone call logs?</string>

	<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->		<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
	<string name="permgrouplab_phone">Phone</string>		<string name="permgrouplab_phone">Phone</string>
	<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->		<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->