Merge "Sort permissions by ascii order" (ecf31b52) · Commits · e / os / android_packages_modules_Bluetooth

android/app/AndroidManifest.xml

+42 −42

Original line number	Original line	Diff line number	Diff line
	@@ -16,66 +16,66 @@
	android:description="@string/permdesc_bluetoothAcceptlist"		android:description="@string/permdesc_bluetoothAcceptlist"
	android:protectionLevel="signature\|privileged"/>		android:protectionLevel="signature\|privileged"/>

	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
	<uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE"/>		<uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE"/>
	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>		<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>		<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
	<uses-permission android:name="android.permission.INTERNET"/>		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
	<uses-permission android:name="android.permission.BLUETOOTH"/>		<uses-permission android:name="android.permission.BLUETOOTH"/>
	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>		<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
	<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>		<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>		<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
	<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
	<uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"/>
	<uses-permission android:name="android.permission.BLUETOOTH_MAP"/>		<uses-permission android:name="android.permission.BLUETOOTH_MAP"/>
	<uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />		<uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"/>
	<uses-permission android:name="android.permission.WAKE_LOCK"/>		<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>		<uses-permission android:name="android.permission.BLUETOOTH_STACK"/>
	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
	<uses-permission android:name="android.permission.READ_CONTACTS"/>
	<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
	<uses-permission android:name="android.permission.READ_CALL_LOG"/>
	<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
	<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
	<uses-permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"/>
	<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
	<uses-permission android:name="android.permission.NFC_HANDOVER_STATUS"/>
	<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
	<uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
	<uses-permission android:name="android.permission.NET_ADMIN"/>
	<uses-permission android:name="android.permission.CALL_PRIVILEGED"/>		<uses-permission android:name="android.permission.CALL_PRIVILEGED"/>
	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
	<uses-permission android:name="android.permission.NET_TUNNELING"/>
	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>		<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
	<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL"/>		<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL"/>
	<uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>		<uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
	<uses-permission android:name="android.permission.NETWORK_FACTORY"/>		<uses-permission android:name="android.permission.DEVICE_POWER"/>
	<uses-permission android:name="android.permission.TETHER_PRIVILEGED"/>		<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
	<uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>		<uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"/>
	<uses-permission android:name="android.permission.BLUETOOTH_STACK"/>
	<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
			<uses-permission android:name="android.permission.INTERNET"/>
			<uses-permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"/>
			<uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES"/>
			<uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES"/>
	<uses-permission android:name="android.permission.MANAGE_USERS"/>		<uses-permission android:name="android.permission.MANAGE_USERS"/>
	<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
	<uses-permission android:name="android.permission.RECEIVE_SMS"/>
	<uses-permission android:name="android.permission.SEND_SMS"/>
	<uses-permission android:name="android.permission.READ_SMS"/>
	<uses-permission android:name="android.permission.WRITE_SMS"/>
	<uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>		<uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
	<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS"/>
	<uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES"/>
	<uses-permission android:name="android.permission.VIBRATE"/>
	<uses-permission android:name="android.permission.DEVICE_POWER"/>
	<uses-permission android:name="android.permission.REAL_GET_TASKS"/>
	<uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING"/>		<uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING"/>
	<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>		<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
			<uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
			<uses-permission android:name="android.permission.NET_ADMIN"/>
			<uses-permission android:name="android.permission.NET_TUNNELING"/>
			<uses-permission android:name="android.permission.NETWORK_FACTORY"/>
			<uses-permission android:name="android.permission.NFC_HANDOVER_STATUS"/>
	<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>		<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
			<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
	<uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES"/>
	<uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
	<uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"/>
	<uses-permission android:name="android.permission.QUERY_AUDIO_STATE"/>		<uses-permission android:name="android.permission.QUERY_AUDIO_STATE"/>
	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>		<uses-permission android:name="android.permission.READ_CALL_LOG"/>
			<uses-permission android:name="android.permission.READ_CONTACTS"/>
			<uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
			<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
			<uses-permission android:name="android.permission.READ_SMS"/>
			<uses-permission android:name="android.permission.REAL_GET_TASKS"/>
			<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
			<uses-permission android:name="android.permission.RECEIVE_SMS"/>
			<uses-permission android:name="android.permission.SEND_SMS"/>
			<uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
			<uses-permission android:name="android.permission.TETHER_PRIVILEGED"/>
			<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS"/>
			<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
			<uses-permission android:name="android.permission.VIBRATE"/>
			<uses-permission android:name="android.permission.WAKE_LOCK"/>
			<uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
			<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
			<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
			<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
			<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
			<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
			<uses-permission android:name="android.permission.WRITE_SMS"/>

	<uses-sdk android:minSdkVersion="14"/>		<uses-sdk android:minSdkVersion="14"/>

apex/permissions/com.android.bluetooth.xml

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -18,24 +18,24 @@
	<permissions>		<permissions>
	<privapp-permissions package="com.android.bluetooth">		<privapp-permissions package="com.android.bluetooth">
	<permission name="android.permission.BLUETOOTH_PRIVILEGED" />		<permission name="android.permission.BLUETOOTH_PRIVILEGED" />
	<permission name="android.permission.CONTROL_INCALL_EXPERIENCE" />
	<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
	<permission name="android.permission.NFC_HANDOVER_STATUS" />
	<permission name="android.permission.WRITE_SECURE_SETTINGS" />
	<permission name="android.permission.WRITE_APN_SETTINGS" />
	<permission name="android.permission.CALL_PRIVILEGED" />		<permission name="android.permission.CALL_PRIVILEGED" />
	<permission name="android.permission.CONNECTIVITY_INTERNAL" />		<permission name="android.permission.CONNECTIVITY_INTERNAL" />
	<permission name="android.permission.TETHER_PRIVILEGED" />		<permission name="android.permission.CONTROL_INCALL_EXPERIENCE" />
	<permission name="android.permission.MODIFY_PHONE_STATE" />
	<permission name="android.permission.INTERACT_ACROSS_USERS" />		<permission name="android.permission.INTERACT_ACROSS_USERS" />
	<permission name="android.permission.INTERACT_ACROSS_USERS_FULL" />		<permission name="android.permission.INTERACT_ACROSS_USERS_FULL" />
	<permission name="android.permission.MANAGE_USERS" />		<permission name="android.permission.MANAGE_USERS" />
	<permission name="android.permission.MEDIA_CONTENT_CONTROL" />		<permission name="android.permission.MEDIA_CONTENT_CONTROL" />
	<permission name="android.permission.UPDATE_APP_OPS_STATS" />
	<permission name="android.permission.REAL_GET_TASKS" />
	<permission name="android.permission.MODIFY_AUDIO_ROUTING" />		<permission name="android.permission.MODIFY_AUDIO_ROUTING" />
	<permission name="android.permission.UPDATE_DEVICE_STATS" />		<permission name="android.permission.MODIFY_PHONE_STATE" />
			<permission name="android.permission.NFC_HANDOVER_STATUS" />
	<permission name="android.permission.PACKAGE_USAGE_STATS" />		<permission name="android.permission.PACKAGE_USAGE_STATS" />
			<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
			<permission name="android.permission.REAL_GET_TASKS" />
	<permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND" />		<permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND" />
			<permission name="android.permission.TETHER_PRIVILEGED" />
			<permission name="android.permission.UPDATE_APP_OPS_STATS" />
			<permission name="android.permission.UPDATE_DEVICE_STATS" />
			<permission name="android.permission.WRITE_APN_SETTINGS" />
			<permission name="android.permission.WRITE_SECURE_SETTINGS" />
	</privapp-permissions>		</privapp-permissions>
	</permissions>		</permissions>