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

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

Merge "Change intent name to ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED" into main

parents c3c7d9f9 0a1fde2a

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+7 −3
Original line number Diff line number Diff line
@@ -5768,13 +5768,17 @@ public class SatelliteController extends Handler { 
                R.string.config_satellite_gateway_service_package);

        String className = getStringFromOverlayConfig(

                R.string.config_satellite_carrier_roaming_esos_provisioned_class);

        String action = getStringFromOverlayConfig(

                R.string.config_satellite_carrier_roaming_esos_provisioned_intent_action);

        if (packageName == null || className == null || packageName.isEmpty()

                || className.isEmpty()) {

            logd("sendBroadCaseToProvisionedESOSSubs: packageName or className is null or empty.");

            return;

        }

        String action = SatelliteManager.ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED;



        Intent intent = new Intent(action);

        intent.setComponent(new ComponentName(packageName, className));

        mContext.sendBroadcast(intent);

        logd("sendBroadCaseToProvisionedESOSSubs");

        logd("sendBroadCaseToProvisionedESOSSubs" + intent);

    }



    private String getStringFromOverlayConfig(int resourceId) {

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -4357,8 +4357,6 @@ public class SatelliteControllerTest extends TelephonyTest { 
                eq(R.string.config_satellite_gateway_service_package));

        doReturn("className").when(mResources).getString(

                eq(R.string.config_satellite_carrier_roaming_esos_provisioned_class));

        doReturn("action").when(mResources).getString(

                eq(R.string.config_satellite_carrier_roaming_esos_provisioned_intent_action));

    }



    private List<SatelliteSubscriberInfo> getExpectedSatelliteSubscriberInfoList() {