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

Commit 37d3b12a authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc95 am:... 

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc95 am: 40d0753b am: 413922e7 am: 426f454b
am: fab95f8a

Change-Id: I7c8ac34bfb4bf1bcf6323163ef872d83ee58bfcc
parents 588411fc fab95f8a

services/core/java/com/android/server/connectivity/Tethering.java

+8 −9
Original line number Original line Diff line number Diff line
@@ -1432,9 +1432,8 @@ public class Tethering extends BaseNetworkObserver { 
            // used to verify this receiver is still current

            // used to verify this receiver is still current

            final private int mGenerationNumber;

            final private int mGenerationNumber;





            // we're interested in edge-triggered LOADED notifications, so

            // used to check the sim state transition from non-loaded to loaded

            // ignore LOADED unless we saw an ABSENT state first

            private boolean mSimNotLoadedSeen = false;

            private boolean mSimAbsentSeen = false;





            public SimChangeBroadcastReceiver(int generationNumber) {

            public SimChangeBroadcastReceiver(int generationNumber) {

                super();

                super();
@@ -1452,14 +1451,14 @@ public class Tethering extends BaseNetworkObserver { 
                final String state =

                final String state =

                        intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);

                        intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);





                Log.d(TAG, "got Sim changed to state " + state + ", mSimAbsentSeen=" +

                Log.d(TAG, "got Sim changed to state " + state + ", mSimNotLoadedSeen=" +

                        mSimAbsentSeen);

                        mSimNotLoadedSeen);

                if (!mSimAbsentSeen && IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(state)) {

                if (!mSimNotLoadedSeen && !IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state)) {

                    mSimAbsentSeen = true;

                    mSimNotLoadedSeen = true;

                }

                }





                if (mSimAbsentSeen && IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state)) {

                if (mSimNotLoadedSeen && IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state)) {

                    mSimAbsentSeen = false;

                    mSimNotLoadedSeen = false;

                    try {

                    try {

                        if (mContext.getResources().getString(com.android.internal.R.string.

                        if (mContext.getResources().getString(com.android.internal.R.string.

                                config_mobile_hotspot_provision_app_no_ui).isEmpty() == false) {

                                config_mobile_hotspot_provision_app_no_ui).isEmpty() == false) {