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

Commit 776d2a8b authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Change security model for TelecomManager#handleCallIntent method."

parents fcab991d efe26996

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
    <uses-permission android:name="android.permission.BROADCAST_CALLLOG_INFO" />

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

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

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

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

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

    <uses-permission android:name="android.permission.MANAGE_USERS" />
@@ -71,6 +72,11 @@ 
            android:label="Process phone account registration"

            android:protectionLevel="signature|system"/>



    <permission

            android:name="android.permission.HANDLE_CALL_INTENT"

            android:label="Protects handling the call intent via the TelecomManager API."

            android:protectionLevel="signature|system"/>



    <application android:label="@string/telecommAppLabel"

            android:icon="@mipmap/ic_launcher_phone"

            android:allowBackup="false"

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

+4 −4
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ public class TelecomServiceImpl { 


    private static final String TIME_LINE_ARG = "timeline";

    private static final int DEFAULT_VIDEO_STATE = -1;

    private static final String PERMISSION_HANDLE_CALL_INTENT =

            "android.permission.HANDLE_CALL_INTENT";



    private final ITelecomService.Stub mBinderImpl = new ITelecomService.Stub() {

        @Override
@@ -1481,12 +1483,10 @@ public class TelecomServiceImpl { 
            try {

                Log.startSession("TSI.hCI");

                synchronized (mLock) {

                    int callingUid = Binder.getCallingUid();

                    mContext.enforceCallingOrSelfPermission(PERMISSION_HANDLE_CALL_INTENT,

                            "handleCallIntent is for internal use only.");



                    long token = Binder.clearCallingIdentity();

                    if (callingUid != Process.myUid()) {

                        throw new SecurityException("handleCallIntent is for Telecom only");

                    }

                    try {

                        Log.i(this, "handleCallIntent: handling call intent");

                        mCallIntentProcessorAdapter.processOutgoingCallIntent(mContext,