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

Commit 7f354143 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Fix TelecomManager#getDefaultPhoneApp" am: b60f7988 

Change-Id: Ib881c84a75b428be1f2b70775daee6d84cbe7dfa
parents 30d7074a b60f7988

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

+7 −1
Original line number Diff line number Diff line
@@ -217,6 +217,12 @@ public class DefaultDialerCache { 
        return mSystemDialerComponentName;

    }



    public ComponentName getDialtactsSystemDialerComponent() {

        final Resources resources = mContext.getResources();

        return new ComponentName(getSystemDialerApplication(),

                resources.getString(R.string.dialer_default_class));

    }



    public void observeDefaultDialerApplication(Executor executor, IntConsumer observer) {

        mRoleManagerAdapter.observeDefaultDialerApp(executor, observer);

    }

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

+1 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.AppOpsManager; 
import android.app.Activity;

import android.app.BroadcastOptions;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;
@@ -495,9 +494,7 @@ public class NewOutgoingCallIntentBroadcaster { 


    private void launchSystemDialer(Uri handle) {

        Intent systemDialerIntent = new Intent();

        systemDialerIntent.setComponent(

                new ComponentName(mDefaultDialerCache.getSystemDialerApplication(),

                    mContext.getResources().getString(R.string.dialer_default_class)));

        systemDialerIntent.setComponent(mDefaultDialerCache.getDialtactsSystemDialerComponent());

        systemDialerIntent.setAction(Intent.ACTION_DIAL);

        systemDialerIntent.setData(handle);

        systemDialerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ public class TelecomServiceImpl { 
        public ComponentName getDefaultPhoneApp() {

            try {

                Log.startSession("TSI.gDPA");

                return mDefaultDialerCache.getSystemDialerComponent();

                return mDefaultDialerCache.getDialtactsSystemDialerComponent();

            } finally {

                Log.endSession();

            }

tests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class NewOutgoingCallIntentBroadcasterTest extends TelecomTestCase { 
        mComponentContextFixture.putResource(R.string.dialer_default_class,

                dialer_default_class_string);

        when(mDefaultDialerCache.getSystemDialerApplication()).thenReturn(ui_package_string);

        when(mDefaultDialerCache.getSystemDialerComponent()).thenReturn(

        when(mDefaultDialerCache.getDialtactsSystemDialerComponent()).thenReturn(

                new ComponentName(ui_package_string, dialer_default_class_string));



        int result = processIntent(intent, false).disconnectCause;