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

Commit f1082805 authored by Evan Charlton's avatar Evan Charlton Committed by Android (Google) Code Review
Browse files

Merge "Use the public API permissions" into lmp-mr1-dev

parents 1813bdd2 116549bf

AndroidManifest.xml

+0 −12
Original line number Diff line number Diff line
@@ -38,18 +38,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/TelecomServiceImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ import java.util.List; 
 */

public class TelecomServiceImpl extends ITelecomService.Stub {

    private static final String REGISTER_PROVIDER_OR_SUBSCRIPTION =

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

            android.Manifest.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION;

    private static final String REGISTER_CONNECTION_MANAGER =

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

            android.Manifest.permission.REGISTER_CONNECTION_MANAGER;



    /** The context. */

    private Context mContext;