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

Commit 9c2c625f authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Fixes ImsResolver when overriding dynamic features 

The GTS test override for ImsService configuration
did not take into account dynamic feature queries.

Bug: 77141737
Test: atest GtsImsServiceTests
Change-Id: Iaea1c4fe0cc3c9cd376a69bf57ccb7da20dfdd4e
parent bd7db2a4

src/java/com/android/internal/telephony/ims/ImsResolver.java

+21 −4
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
            "android.telephony.ims.EMERGENCY_MMTEL_FEATURE";

    public static final String METADATA_MMTEL_FEATURE = "android.telephony.ims.MMTEL_FEATURE";

    public static final String METADATA_RCS_FEATURE = "android.telephony.ims.RCS_FEATURE";

    // Overrides the sanity permission check of android.permission.BIND_IMS_SERVICE for any

    // ImsService that is connecting to the platform.

    // This should ONLY be used for testing and should not be used in production ImsServices.

    private static final String METADATA_OVERRIDE_PERM_CHECK = "override_bind_check";



    // Based on updates from PackageManager

    private static final int HANDLER_ADD_PACKAGE = 0;
@@ -382,7 +386,18 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
                        unbindImsService(getImsServiceInfoFromCache(mDeviceService));

                    }

                    mDeviceService = packageName;

                    bindImsService(getImsServiceInfoFromCache(packageName));

                    ImsServiceInfo deviceInfo = getImsServiceInfoFromCache(mDeviceService);

                    if (deviceInfo == null) {

                        // The package name is either "" or does not exist on the device.

                        break;

                    }

                    if (deviceInfo.featureFromMetadata) {

                        bindImsService(deviceInfo);

                    } else {

                        // newly added ImsServiceInfo that has not had features queried yet. Start

                        // async bind and query features.

                        scheduleQueryForFeatures(deviceInfo);

                    }

                }

                break;

            }
@@ -1240,9 +1255,11 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
                Log.i(TAG, "service name: " + info.name + ", manifest query: "

                        + info.featureFromMetadata);

                // Check manifest permission to be sure that the service declares the correct

                // permissions.

                if (TextUtils.equals(serviceInfo.permission,

                        Manifest.permission.BIND_IMS_SERVICE)) {

                // permissions. Overridden if the METADATA_OVERRIDE_PERM_CHECK metadata is set to

                // true.

                // NOTE: METADATA_OVERRIDE_PERM_CHECK should only be set for testing.

                if (TextUtils.equals(serviceInfo.permission, Manifest.permission.BIND_IMS_SERVICE)

                        || serviceInfo.metaData.getBoolean(METADATA_OVERRIDE_PERM_CHECK, false)) {

                    infos.add(info);

                } else {

                    Log.w(TAG, "ImsService is not protected with BIND_IMS_SERVICE permission: "