diff options
| author | Oscar Shu <xshu@google.com> | 2018-04-11 21:59:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-11 21:59:38 +0000 |
| commit | 03b2a94a34ab39bc7d8a26824808d7b2e99ee650 (patch) | |
| tree | 073949c6d664d893f82204e02fa403b30e93766e | |
| parent | 79a42ce01b63dc1627c871027d1f2e83b4f63ffc (diff) | |
| parent | cd211f955772453276711624b4be8353edd17826 (diff) | |
Merge changes Idebc8289,I4201b669 into pi-dev
* changes:
Include trigger reason in the bugreport title
Remove incorrect check
| -rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index 3db804b9b..76b44c82f 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -653,13 +653,14 @@ public class WifiController extends StateMachine { mFirstUserSignOnSeen = true; return HANDLED; } else if (msg.what == CMD_RECOVERY_RESTART_WIFI) { - final String bugTitle = "Wi-Fi BugReport"; + final String bugTitle; final String bugDetail; - if (msg.obj != null && msg.arg1 < SelfRecovery.REASON_STRINGS.length - && msg.arg1 >= 0) { + if (msg.arg1 < SelfRecovery.REASON_STRINGS.length && msg.arg1 >= 0) { bugDetail = SelfRecovery.REASON_STRINGS[msg.arg1]; + bugTitle = "Wi-Fi BugReport: " + bugDetail; } else { bugDetail = ""; + bugTitle = "Wi-Fi BugReport"; } if (msg.arg1 != SelfRecovery.REASON_LAST_RESORT_WATCHDOG) { (new Handler(mWifiStateMachineLooper)).post(() -> { |