From fab030b9c0021bbe4c60f6ec953ff7a37eadb427 Mon Sep 17 00:00:00 2001 From: Joshua Duong Date: Tue, 7 Apr 2020 23:49:46 -0700 Subject: [PATCH] Hide notification shade when WifiDebuggingActivity is shown. Wireless debugging can be enabled from a quick settings tile, and this gets covered by the notification shade. Bug: 153275926 Test: Enable wifi debugging qstile from Settings > Developer options > Quick settings developer tiles > Wireless debugging. On notification shade, enable wireless debugging on an untrusted network. Notification shade should be hidden to reveal the WifiDebuggingActivity. Change-Id: I347e23ab85ee1235c20eab9a2318e1d8afe8975a (cherry picked from commit 96f32de847a25c1c4a33b2e3d6c0f402ae64d2d4) Exempt-From-Owner-Approval: cherry-pick --- .../src/com/android/systemui/wifi/WifiDebuggingActivity.java | 3 +++ .../systemui/wifi/WifiDebuggingSecondaryUserActivity.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingActivity.java b/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingActivity.java index a94af24fc843e..1c7a9b5e86812 100644 --- a/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingActivity.java +++ b/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingActivity.java @@ -175,6 +175,9 @@ public class WifiDebuggingActivity extends AlertActivity IntentFilter filter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION); filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); registerReceiver(mWifiChangeReceiver, filter); + // Close quick shade + sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); + } @Override diff --git a/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingSecondaryUserActivity.java b/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingSecondaryUserActivity.java index 0266a84503a14..7a31fa54b1cdb 100644 --- a/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingSecondaryUserActivity.java +++ b/packages/SystemUI/src/com/android/systemui/wifi/WifiDebuggingSecondaryUserActivity.java @@ -96,6 +96,8 @@ public class WifiDebuggingSecondaryUserActivity extends AlertActivity IntentFilter filter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION); filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); registerReceiver(mWifiChangeReceiver, filter); + // Close quick shade + sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); } @Override