Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-27 20:36:29 +00:00
committed by Android (Google) Code Review
parent 90e9bbc814 3294256ba5
commit d9ab9df05b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -1541,9 +1541,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
// 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();
@@ -1561,14 +1560,14 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
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) {