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

Commit 42047b96 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

Merge "Do not create multiple satellite listeners in onServiceConnected." into... 

Merge "Do not create multiple satellite listeners in onServiceConnected." into 24D1-dev am: 1dfef654

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/27473339



Change-Id: Ice45d7b88432e8f503b890d17f05287676b31869
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8325c21f 1dfef654

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

+6 −5
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ public class SatelliteModemInterface { 
    @NonNull private static SatelliteModemInterface sInstance;

    @NonNull private final Context mContext;

    @NonNull private final DemoSimulator mDemoSimulator;

    @NonNull private final SatelliteListener mVendorListener;

    @NonNull private final SatelliteListener mDemoListener;

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    @NonNull protected final ExponentialBackoff mExponentialBackoff;

    @NonNull private final Object mLock = new Object();
@@ -237,6 +239,8 @@ public class SatelliteModemInterface { 
            SatelliteController satelliteController, @NonNull Looper looper) {

        mContext = context;

        mDemoSimulator = DemoSimulator.make(context, satelliteController);

        mVendorListener = new SatelliteListener(false);

        mDemoListener = new SatelliteListener(true);

        mIsSatelliteServiceSupported = getSatelliteServiceSupport();

        mSatelliteController = satelliteController;

        mExponentialBackoff = new ExponentialBackoff(REBIND_INITIAL_DELAY, REBIND_MAXIMUM_DELAY,
@@ -349,11 +353,8 @@ public class SatelliteModemInterface { 
            mSatelliteService = ISatellite.Stub.asInterface(service);

            mExponentialBackoff.stop();

            try {

                SatelliteListener vendorListener = new SatelliteListener(false);

                mSatelliteService.setSatelliteListener(vendorListener);



                SatelliteListener demoListener = new SatelliteListener(true);

                mDemoSimulator.setSatelliteListener(demoListener);

                mSatelliteService.setSatelliteListener(mVendorListener);

                mDemoSimulator.setSatelliteListener(mDemoListener);

            } catch (RemoteException e) {

                // TODO: Retry setSatelliteListener

                logd("setSatelliteListener: RemoteException " + e);