diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2019-02-12 03:58:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-12 03:58:09 +0000 |
commit | 07bbe0c5b03d5edb79e29e5809c5430ee3c00e2d (patch) | |
tree | abf95c6a752435fd06e3b7fb5a4ed8f0c63262f3 | |
parent | 4abf31ae05f19eb59b4d0c37dd5cade2bd6ee711 (diff) | |
parent | 1e3eb37e516bec4c5a6c09671602d70aee25f644 (diff) |
Merge "Remove hard-coded NetworkStack package name"
-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 0d6d080..2e72d82 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -500,7 +500,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(); |