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

Commit da5e8d73 authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

Merge "Migrate system dialer config to RoleManager"

parents dc1770da 39120768

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 
         handle playing of the tones. -->

    <bool name="allow_local_dtmf_tones">true</bool>



    <!-- Package name for the default in-call UI and dialer [DO NOT TRANSLATE] -->

    <string name="ui_default_package" translatable="false">com.android.dialer</string>



    <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->

    <string name="incall_default_class" translatable="false">com.android.incallui.InCallServiceImpl</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class DefaultDialerCache { 
        mContext = context;

        mDefaultDialerManagerAdapter = defaultDialerManagerAdapter;

        mLock = lock;

        mSystemDialerName = mContext.getResources().getString(R.string.ui_default_package);

        mSystemDialerName = TelecomServiceImpl.getSystemDialerPackage(mContext);



        IntentFilter packageIntentFilter = new IntentFilter();

        packageIntentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);

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

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ public class InCallController extends CallsManagerListenerBase { 


        Resources resources = mContext.getResources();

        mSystemInCallComponentName = new ComponentName(

                resources.getString(R.string.ui_default_package),

                TelecomServiceImpl.getSystemDialerPackage(mContext),

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



        mSystemStateHelper.addListener(mSystemStateListener);

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

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ public class NewOutgoingCallIntentBroadcaster { 
        Intent systemDialerIntent = new Intent();

        final Resources resources = mContext.getResources();

        systemDialerIntent.setClassName(

                resources.getString(R.string.ui_default_package),

                TelecomServiceImpl.getSystemDialerPackage(mContext),

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

        systemDialerIntent.setAction(Intent.ACTION_DIAL);

        systemDialerIntent.setData(handle);

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.telecom;



import android.content.Intent;

import android.os.UserHandle;



import java.util.List;
@@ -25,6 +26,14 @@ import java.util.List; 
 * and remove direct dependencies.

 */

public interface RoleManagerAdapter {



    /**

     * The name of the dialer role.

     *

     * @see Intent#ACTION_DIAL

     */

    String ROLE_DIALER = "android.app.role.DIALER";



    /**

     * Returns the package name of the app which fills the {@link android.app.role.RoleManager} call

     * redirection role.