diff options
| author | Mitchell Wills <mwills@google.com> | 2015-08-04 17:10:58 -0700 |
|---|---|---|
| committer | Ian Pedowitz <ijpedowitz@google.com> | 2015-10-16 01:32:45 +0000 |
| commit | a8ed84c590e48ce3e5b31b2f3d0ddd53a22b6a65 (patch) | |
| tree | a4d4d7b759186671408ce6eadc2302706671af96 | |
| parent | 4a7d385069e9e1a490d6d2a8427536e1506a5801 (diff) | |
| download | android_frameworks_opt_net_wifi-a8ed84c590e48ce3e5b31b2f3d0ddd53a22b6a65.tar.gz android_frameworks_opt_net_wifi-a8ed84c590e48ce3e5b31b2f3d0ddd53a22b6a65.tar.bz2 android_frameworks_opt_net_wifi-a8ed84c590e48ce3e5b31b2f3d0ddd53a22b6a65.zip | |
DO NOT MERGE Make sure wifi driver is actually turned off when requested
Bug: 22808676
Change-Id: Iddcda4ae77235c789a3e6a96b946bb720f73b122
| -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 107fee34a..cf98a8e74 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); } @@ -4027,7 +4027,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; @@ -6395,7 +6396,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, |