commit 07bbe0c5b03d5edb79e29e5809c5430ee3c00e2d
author Remi NGUYEN VAN <reminv@google.com> Tue Feb 12 03:58:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 12 03:58:09 2019 +0000
tree abf95c6a752435fd06e3b7fb5a4ed8f0c63262f3
parent 4abf31ae05f19eb59b4d0c37dd5cade2bd6ee711
parent 1e3eb37e516bec4c5a6c09671602d70aee25f644

Merge "Remove hard-coded NetworkStack package name"

src/com/android/server/connectivity/NetworkMonitor.java

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 @@
 
     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);
         }

tests/src/com/android/server/connectivity/NetworkMonitorTest.java

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 @@
         nm.notifyNetworkConnected();
 
         verify(mCallbacks, timeout(HANDLER_TIMEOUT_MS).times(1))
-                .showProvisioningNotification(any());
+                .showProvisioningNotification(any(), any());
 
         // Check that startCaptivePortalApp sends the expected intent.
         nm.launchCaptivePortalApp();