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

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

Merge "Avoid the interference of real SG-APK app during CTS tests" into main

parents a2582a5a bae2f9a4

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

+16 −5
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ public class SatelliteController extends Handler { 
    private AtomicBoolean mOverrideNtnEligibility;

    private String mDefaultSmsPackageName = "";

    private String mSatelliteGatewayServicePackageName = "";

    private String mOverriddenSatelliteGatewayServicePackageName = "";

    private Boolean mOverriddenDisableSatelliteWhileEnableInProgressSupported = null;



    private final Object mNtnSmsSupportedByMessagesAppLock = new Object();
@@ -3950,12 +3951,13 @@ public class SatelliteController extends Handler { 
        }



        if (servicePackageName == null || servicePackageName.equals("null")) {

            mSatelliteGatewayServicePackageName = getConfigSatelliteGatewayServicePackage();

            mOverriddenSatelliteGatewayServicePackageName = null;

        } else {

            mSatelliteGatewayServicePackageName = servicePackageName;

            mOverriddenSatelliteGatewayServicePackageName = servicePackageName;

        }

        plogd("setSatelliteGatewayServicePackageName: mSatelliteGatewayServicePackageName="

                + mSatelliteGatewayServicePackageName);

        plogd("setSatelliteGatewayServicePackageName: "

                + "mOverriddenSatelliteGatewayServicePackageName="

                + mOverriddenSatelliteGatewayServicePackageName);



        return mSatelliteSessionController.setSatelliteGatewayServicePackageName(

                servicePackageName);
@@ -9116,7 +9118,7 @@ public class SatelliteController extends Handler { 
            // Manual Connected

            plogd("isP2PSmsDisallowedOnCarrierRoamingNtn: manual connect");

            if (!isNtnSmsSupportedByMessagesApp()

                    || !isApplicationSupportsP2P(mSatelliteGatewayServicePackageName)) {

                    || !isApplicationSupportsP2P(getSatelliteGatewayServicePackageName())) {

                plogd("isP2PSmsDisallowedOnCarrierRoamingNtn: APKs do not supports P2P");

                return true;

            }
@@ -9125,6 +9127,15 @@ public class SatelliteController extends Handler { 
        return false;

    }



    private String getSatelliteGatewayServicePackageName() {

        if (mOverriddenSatelliteGatewayServicePackageName != null) {

            logd("getSatelliteGatewayServicePackageName: return overridden package name"

                    + " for CTS test " + mOverriddenSatelliteGatewayServicePackageName);

            return mOverriddenSatelliteGatewayServicePackageName;

        }

        return mSatelliteGatewayServicePackageName;

    }



    @NonNull

    private int[] getSupportedSatelliteServicesForCarrier(int subId) {

        PersistableBundle config = getPersistableBundle(subId);