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

DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation

Browse Source 
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)

Test: Manual
bug: 33815946

Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
This commit is contained in:
Jack Yu
2017-01-16 10:49:55 -08:00
parent b38770b58e
commit cf7f4ba3fa
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1244,10 +1244,6 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
return false; return false;
} }
private boolean isSimCardAbsent(String state) {
return IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(state);
}
private boolean isSimCardLoaded(String state) { private boolean isSimCardLoaded(String state) {
return IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state); return IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state);
} }
@@ -1264,9 +1260,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) {
mGenerationNumber = generationNumber; mGenerationNumber = generationNumber;
@@ -1284,16 +1279,16 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
final String state = intent.getStringExtra( final String state = intent.getStringExtra(
IccCardConstants.INTENT_KEY_ICC_STATE); 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 (isSimCardAbsent(state)) { if (!isSimCardLoaded(state)) {
if (!mSimAbsentSeen) mSimAbsentSeen = true; if (!mSimNotLoadedSeen) mSimNotLoadedSeen = true;
return; return;
} }
if (isSimCardLoaded(state) && mSimAbsentSeen) { if (isSimCardLoaded(state) && mSimNotLoadedSeen) {
mSimAbsentSeen = false; mSimNotLoadedSeen = false;
if (!hasMobileHotspotProvisionApp()) return; if (!hasMobileHotspotProvisionApp()) return;