commit 6699f1e06962a396fe9c0adfd9d8ffb8db740db2
author Remi NGUYEN VAN <reminv@google.com> Tue Feb 12 04:47:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 12 04:47:43 2019 +0000
tree a696995d64b811d3ed9d49115645b4d466f7a61a
parent 07bbe0c5b03d5edb79e29e5809c5430ee3c00e2d
parent 06a30e5c6a4e6d67ee41501106660f20cbcc9d1a

Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack"

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();