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

Commit f478b554 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix check for component enabled state in IncallServiceController"

parents 6d4ed3ea fa7996ea

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

+19 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,10 @@ public class InCallController extends CallsManagerListenerBase { 
                if (requestedType == IN_CALL_SERVICE_TYPE_NON_UI) {

                    mKnownNonUiInCallServices.add(foundComponentName);

                }

                if (serviceInfo.enabled && (requestedType == 0 || requestedType == currentType)) {

                

                boolean isEnabled = isServiceEnabled(foundComponentName,

                        serviceInfo, packageManager);

                if (isEnabled && (requestedType == 0 || requestedType == currentType)) {

                    retval.add(new InCallServiceInfo(foundComponentName,

                            isExternalCallsSupported, isSelfManageCallsSupported, requestedType));

                }
@@ -1533,6 +1536,21 @@ public class InCallController extends CallsManagerListenerBase { 
        return retval;

    }



    private boolean isServiceEnabled(ComponentName componentName,

            ServiceInfo serviceInfo, PackageManager packageManager) {

        int componentEnabledState = packageManager.getComponentEnabledSetting(componentName);



        if (componentEnabledState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {

            return true;

        }



        if (componentEnabledState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {

            return serviceInfo.isEnabled();

        }



        return false;

    }



    private boolean shouldUseCarModeUI() {

        return mCarModeTracker.isInCarMode();

    }

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

+22 −0
Original line number Diff line number Diff line
@@ -1260,6 +1260,28 @@ public class InCallControllerTests extends TelecomTestCase { 
            }

        }).when(mMockPackageManager).queryIntentServicesAsUser(

                any(Intent.class), anyInt(), eq(CURRENT_USER_ID));



        if (useDefaultDialer) {

            when(mMockPackageManager

                    .getComponentEnabledSetting(new ComponentName(DEF_PKG, DEF_CLASS)))

                    .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);

        }



        when(mMockPackageManager

                .getComponentEnabledSetting(new ComponentName(SYS_PKG, SYS_CLASS)))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);



        when(mMockPackageManager

                .getComponentEnabledSetting(new ComponentName(CAR_PKG, CAR_CLASS)))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);



        when(mMockPackageManager

                .getComponentEnabledSetting(new ComponentName(COMPANION_PKG, COMPANION_CLASS)))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);



        when(mMockPackageManager

                .getComponentEnabledSetting(new ComponentName(CAR2_PKG, CAR2_CLASS)))

                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);

    }



    private void setupMockPackageManagerLocationPermission(final String pkg,