Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

frameworks-base: コミット

frameworks/base


コミットメタ情報

リビジョンdc921d3fa770fd5b68fc88a84f6f26f9f2f5042e (tree)
日時2013-10-20 03:52:16
作者Chih-Wei Huang <cwhuang@linu...>
コミッターChih-Wei Huang

ログメッセージ

Android 4.3.1 Release 1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAlJS/+AACgkQ6K0/gZqxDnghQQCcC8+IyovjieVlJcozysRFSXwf
DpoAn1pFT480phcau2lMwi3YuvSlm+hW
=zGvh
-----END PGP SIGNATURE-----

Merge tag 'android-4.3.1_r1' into jb-x86

Android 4.3.1 Release 1

変更サマリ

差分

--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -190,8 +190,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
190190 private class MobileDataStateReceiver extends BroadcastReceiver {
191191 @Override
192192 public void onReceive(Context context, Intent intent) {
193- // Assume this isn't a provisioning network.
194- mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
195193 if (intent.getAction().equals(TelephonyIntents.
196194 ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN)) {
197195 String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY);
@@ -218,6 +216,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
218216 if (!TextUtils.equals(apnType, mApnType)) {
219217 return;
220218 }
219+ // Assume this isn't a provisioning network.
220+ mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
221221 if (DBG) {
222222 log("Broadcast received: " + intent.getAction() + " apnType=" + apnType);
223223 }
@@ -299,6 +299,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
299299 if (!TextUtils.equals(apnType, mApnType)) {
300300 return;
301301 }
302+ // Assume this isn't a provisioning network.
303+ mNetworkInfo.setIsConnectedToProvisioningNetwork(false);
302304 String reason = intent.getStringExtra(PhoneConstants.FAILURE_REASON_KEY);
303305 String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY);
304306 if (DBG) {
旧リポジトリブラウザで表示