diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-07 22:59:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-07 22:59:26 +0000 |
| commit | 7a09b5c67fac75d80633dc02c24b67bfd1b923a3 (patch) | |
| tree | 83f0278a8d91e7fe131c760c4006d3c2e8f7de23 | |
| parent | 214b6e5f38957f5c9695e197da7af9ea8fc5d06a (diff) | |
| parent | 126b32b2f9573e509771f990252762889177e536 (diff) | |
Merge "WifiDiagnostics: Temporarily disable bugreport collection"
| -rw-r--r-- | service/java/com/android/server/wifi/WifiDiagnostics.java | 3 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiDiagnostics.java b/service/java/com/android/server/wifi/WifiDiagnostics.java index da1e5b3c5..c334763c9 100644 --- a/service/java/com/android/server/wifi/WifiDiagnostics.java +++ b/service/java/com/android/server/wifi/WifiDiagnostics.java @@ -299,7 +299,8 @@ class WifiDiagnostics extends BaseWifiDiagnostics { * Initiates a system-level bugreport, in a non-blocking fashion. */ public void takeBugReport(String bugTitle, String bugDetail) { - if (mBuildProperties.isUserBuild()) { + // TODO (b/143494985): Re-enable it once we have a formal API. + if (true || mBuildProperties.isUserBuild()) { return; } diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java index e4b1d7029..9161170e3 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java @@ -857,6 +857,7 @@ public class WifiDiagnosticsTest extends WifiBaseTest { } @Test + @Ignore("TODO(b/143494985): re-enabled this @Test") public void takeBugReportCallsActivityManagerOnUserDebug() { when(mBuildProperties.isUserBuild()).thenReturn(false); mWifiDiagnostics.takeBugReport("", ""); @@ -865,6 +866,7 @@ public class WifiDiagnosticsTest extends WifiBaseTest { } @Test + @Ignore("TODO(b/143494985): re-enabled this @Test") public void takeBugReportSwallowsExceptions() { when(mBuildProperties.isUserBuild()).thenReturn(false); doThrow(new RuntimeException()).when(mActivityManagerService).requestWifiBugReport( |