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

Commit ec7b3760 authored by Evan Charlton's avatar Evan Charlton Committed by Natiq Ahmed
Browse files

Use the public API permissions 

Migrate the permissions to the new ones in the android.* namespace
instead of the com.android.server.telecom.* namespace.

Bug: 18114695
Conflicts:
	src/com/android/server/telecom/TelecomServiceImpl.java

Change-Id: I1b8578cbc82e95ea78b4a2166f4a23650a0c375f
parent 7d8cd0b5

AndroidManifest.xml

+0 −12
Original line number Diff line number Diff line
@@ -39,18 +39,6 @@ 
    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.BROADCAST_CALLLOG_INFO" />



    <!-- Protects the ability to register any PhoneAccount with a capability flags of either

         PhoneAccount#CAPABILITY_CALL_PROVIDER or PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. -->

    <permission

            android:name="com.android.server.telecom.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION"

            android:label="Register CALL_PROVIDER or SIM_SUBSCRIPTION PhoneAccount"

            android:protectionLevel="signature"/>



    <permission

            android:name="com.android.server.telecom.permission.REGISTER_CONNECTION_MANAGER"

            android:label="Register CONNECTION_MANAGER PhoneAccount"

            android:protectionLevel="signature"/>



    <permission

            android:name="android.permission.BROADCAST_CALLLOG_INFO"

            android:label="Broadcast the call type/duration information"

src/com/android/server/telecom/TelecomService.java

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ public class TelecomService extends Service { 
    public static final String SERVICE_INTERFACE = "android.telecom.ITelecomService";



    private static final String REGISTER_PROVIDER_OR_SUBSCRIPTION =

            "com.android.server.telecom.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION";



            android.Manifest.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION;

    /** The context. */

    private Context mContext;