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

resolve merge conflicts of e06c03d843 to nyc-mr1-dev-plus-aosp

Browse Source 
Test: Manual test
Change-Id: I13f288c5056b672eec00f850f9d2ee6db73b7a44
This commit is contained in:
Jack Yu
2017-02-02 15:32:36 -08:00
parent eeeb10c645 e06c03d843
commit 5c6041843d
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;