diff options
| author | Mitchell Wills <mwills@google.com> | 2015-10-16 01:49:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 01:49:04 +0000 |
| commit | 799ee792f8d985fe1d24638e9d7d6463dd8d39f9 (patch) | |
| tree | 7beb239841e3623482c7965ebe1a49e295281bcb | |
| parent | 93fb74bd37bc4d2198e751958cd425073e5c2911 (diff) | |
| parent | 9d86423893492156db7fbc1b4f94ef0517ca9220 (diff) | |
| download | android_frameworks_opt_net_wifi-799ee792f8d985fe1d24638e9d7d6463dd8d39f9.tar.gz android_frameworks_opt_net_wifi-799ee792f8d985fe1d24638e9d7d6463dd8d39f9.tar.bz2 android_frameworks_opt_net_wifi-799ee792f8d985fe1d24638e9d7d6463dd8d39f9.zip | |
am 9d864238: am a8ed84c5: DO NOT MERGE Make sure wifi driver is actually turned off when requested
* commit '9d86423893492156db7fbc1b4f94ef0517ca9220':
DO NOT MERGE Make sure wifi driver is actually turned off when requested
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 75e20b312..5e3ef6fcc 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1355,7 +1355,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno PendingIntent getPrivateBroadcast(String action, int requestCode) { Intent intent = new Intent(action, null); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); - //intent.setPackage(this.getClass().getPackage().getName()); + // TODO: Find the correct value so this is not hard coded intent.setPackage("android"); return PendingIntent.getBroadcast(mContext, requestCode, intent, 0); } @@ -4024,7 +4024,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno || state == SupplicantState.GROUP_HANDSHAKE || (/* keep autojoin enabled if user has manually selected a wifi network, so as to make sure we reliably remain connected to this network */ - mConnectionRequests == 0 && selection == null)) { + mConnectionRequests == 0 && selection == null) + || mInDelayedStop) { // Dont attempt auto-joining again while we are already attempting to join // and/or obtaining Ip address attemptAutoJoin = false; @@ -6392,7 +6393,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno /* send regular delayed shut down */ Intent driverStopIntent = new Intent(ACTION_DELAYED_DRIVER_STOP, null); - driverStopIntent.setPackage(this.getClass().getPackage().getName()); + driverStopIntent.setPackage("android"); driverStopIntent.putExtra(DELAYED_STOP_COUNTER, mDelayedStopCounter); mDriverStopIntent = PendingIntent.getBroadcast(mContext, DRIVER_STOP_REQUEST, driverStopIntent, |