diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2019-02-07 21:29:57 +0900 |
---|---|---|
committer | Remi NGUYEN VAN <reminv@google.com> | 2019-02-08 12:12:57 +0900 |
commit | 1e3eb37e516bec4c5a6c09671602d70aee25f644 (patch) | |
tree | 61953503ca545b9d16fb296b29b6124bf4633fdf | |
parent | 7db6a11f12cca838ba7772f6067be0a7bbf39c69 (diff) |
Remove hard-coded NetworkStack package name
Have the network stack pass its package name in
showProvisioningNotification instead.
Bug: 124033493
Test: flashed, WiFi and captive portal works
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1f3312768ba1fb34e99a827e1fcdaf7510e318a8
-rw-r--r-- | src/com/android/server/connectivity/NetworkMonitor.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/server/connectivity/NetworkMonitorTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index dbffa6d..ae031e9 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -499,7 +499,7 @@ public class NetworkMonitor extends StateMachine { private void showProvisioningNotification(String action) { try { - mCallback.showProvisioningNotification(action); + mCallback.showProvisioningNotification(action, mContext.getPackageName()); } catch (RemoteException e) { Log.e(TAG, "Error showing provisioning notification", e); } diff --git a/tests/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/src/com/android/server/connectivity/NetworkMonitorTest.java index d11bb64..b98b0f7 100644 --- a/tests/src/com/android/server/connectivity/NetworkMonitorTest.java +++ b/tests/src/com/android/server/connectivity/NetworkMonitorTest.java @@ -482,7 +482,7 @@ public class NetworkMonitorTest { nm.notifyNetworkConnected(); verify(mCallbacks, timeout(HANDLER_TIMEOUT_MS).times(1)) - .showProvisioningNotification(any()); + .showProvisioningNotification(any(), any()); // Check that startCaptivePortalApp sends the expected intent. nm.launchCaptivePortalApp(); |