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

am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev

Browse Source 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
This commit is contained in:
Robert Greenwalt
2015-01-21 23:56:02 +00:00
committed by Android Git Automerger
parent a1838a9d78 7ca16ff8c6
commit 0343e1a704
3 changed files with 118 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/NetworkFactory.java
View File

@@ -219,16 +219,21 @@ public class NetworkFactory extends Handler {
}
private void evalRequest(NetworkRequestInfo n) {
if (VDBG) log("evalRequest");
if (n.requested == false && n.score < mScore &&
n.request.networkCapabilities.satisfiedByNetworkCapabilities(
mCapabilityFilter) && acceptRequest(n.request, n.score)) {
if (VDBG) log(" needNetworkFor");
needNetworkFor(n.request, n.score);
n.requested = true;
} else if (n.requested == true &&
(n.score > mScore || n.request.networkCapabilities.satisfiedByNetworkCapabilities(
mCapabilityFilter) == false || acceptRequest(n.request, n.score) == false)) {
if (VDBG) log(" releaseNetworkFor");
releaseNetworkFor(n.request);
n.requested = false;
} else {
if (VDBG) log(" done");
}
}

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
View File

@@ -110,7 +110,6 @@ public class HotspotControllerImpl implements HotspotController {
intent.putExtra(EXTRA_RUN_PROVISION, true);
intent.putExtra(EXTRA_ENABLE_WIFI_TETHER, true);
intent.setComponent(ComponentName.unflattenFromString(tetherEnable));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startServiceAsUser(intent, UserHandle.CURRENT);
} else {
int wifiState = mWifiManager.getWifiState();

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

@@ -20,6 +20,7 @@ import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -45,8 +46,10 @@ import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.telephony.IccCardConstants;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.util.IState;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
@@ -63,6 +66,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
/**
* @hide
@@ -1377,6 +1382,112 @@ public class Tethering extends BaseNetworkObserver {
}
}
private final AtomicInteger mSimBcastGenerationNumber = new AtomicInteger(0);
private SimChangeBroadcastReceiver mBroadcastReceiver = null;
// keep consts in sync with packages/apps/Settings TetherSettings.java
private static final int WIFI_TETHERING = 0;
private static final int USB_TETHERING = 1;
private static final int BLUETOOTH_TETHERING = 2;
// keep consts in sync with packages/apps/Settings TetherService.java
private static final String EXTRA_ADD_TETHER_TYPE = "extraAddTetherType";
private static final String EXTRA_RUN_PROVISION = "extraRunProvision";
private void startListeningForSimChanges() {
if (DBG) Log.d(TAG, "startListeningForSimChanges");
if (mBroadcastReceiver == null) {
mBroadcastReceiver = new SimChangeBroadcastReceiver(
mSimBcastGenerationNumber.incrementAndGet());
final IntentFilter filter = new IntentFilter();
filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
mContext.registerReceiver(mBroadcastReceiver, filter);
}
}
private void stopListeningForSimChanges() {
if (DBG) Log.d(TAG, "stopListeningForSimChanges");
if (mBroadcastReceiver != null) {
mSimBcastGenerationNumber.incrementAndGet();
mContext.unregisterReceiver(mBroadcastReceiver);
mBroadcastReceiver = null;
}
}
class SimChangeBroadcastReceiver extends BroadcastReceiver {
// used to verify this receiver is still current
final private int mGenerationNumber;
// we're interested in edge-triggered LOADED notifications, so
// ignore LOADED unless we saw an ABSENT state first
private boolean mSimAbsentSeen = false;
public SimChangeBroadcastReceiver(int generationNumber) {
super();
mGenerationNumber = generationNumber;
}
@Override
public void onReceive(Context context, Intent intent) {
if (DBG) {
Log.d(TAG, "simchange mGenerationNumber=" + mGenerationNumber +
", current generationNumber=" + mSimBcastGenerationNumber.get());
}
if (mGenerationNumber != mSimBcastGenerationNumber.get()) return;
final String state =
intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);
Log.d(TAG, "got Sim changed to state " + state + ", mSimAbsentSeen=" +
mSimAbsentSeen);
if (!mSimAbsentSeen && IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(state)) {
mSimAbsentSeen = true;
}
if (mSimAbsentSeen && IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(state)) {
mSimAbsentSeen = false;
try {
if (mContext.getResources().getString(com.android.internal.R.string.
config_mobile_hotspot_provision_app_no_ui).isEmpty() == false) {
final String tetherService = mContext.getResources().getString(
com.android.internal.R.string.config_wifi_tether_enable);
ArrayList<Integer> tethered = new ArrayList<Integer>();
synchronized (mPublicSync) {
Set ifaces = mIfaces.keySet();
for (Object iface : ifaces) {
TetherInterfaceSM sm = mIfaces.get(iface);
if (sm != null && sm.isTethered()) {
if (isUsb((String)iface)) {
tethered.add(new Integer(USB_TETHERING));
} else if (isWifi((String)iface)) {
tethered.add(new Integer(WIFI_TETHERING));
} else if (isBluetooth((String)iface)) {
tethered.add(new Integer(BLUETOOTH_TETHERING));
}
}
}
}
for (int tetherType : tethered) {
Intent startProvIntent = new Intent();
startProvIntent.putExtra(EXTRA_ADD_TETHER_TYPE, tetherType);
startProvIntent.putExtra(EXTRA_RUN_PROVISION, true);
startProvIntent.setComponent(
ComponentName.unflattenFromString(tetherService));
mContext.startServiceAsUser(startProvIntent, UserHandle.CURRENT);
}
Log.d(TAG, "re-evaluate provisioning");
} else {
Log.d(TAG, "no prov-check needed for new SIM");
}
} catch (Resources.NotFoundException e) {
Log.d(TAG, "no prov-check needed for new SIM");
// not defined, do nothing
}
}
}
}
class InitialState extends TetherMasterUtilState {
@Override
public void enter() {
@@ -1413,6 +1524,7 @@ public class Tethering extends BaseNetworkObserver {
@Override
public void enter() {
turnOnMasterTetherSettings(); // may transition us out
startListeningForSimChanges();
mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; // better try something first pass
// or crazy tests cases will fail
@@ -1422,6 +1534,7 @@ public class Tethering extends BaseNetworkObserver {
@Override
public void exit() {
turnOffUpstreamMobileConnection();
stopListeningForSimChanges();
notifyTetheredOfNewUpstreamIface(null);
}
@Override