commit ba3cedd7f1ed6cd9862e15fa47c8863c300fc4e1
author Chiachang Wang <chiachangwang@google.com> Thu Feb 13 06:41:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 06:41:53 2020 +0000
tree 89963062730aa6b6bc604b806a48c86f4834e9ee
parent 32e18bea0823865a2f9b77f6cd8bcc2a5cb5d41a
parent 1fa770dc9e061039da5f59aba04fedbab847b3bc

Merge "Add permission check for CaptivePortal#reevaluateNetwork"

core/java/android/net/CaptivePortal.java

diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java
index fb35b4b..448fe5a 100644
--- a/core/java/android/net/CaptivePortal.java
+++ b/core/java/android/net/CaptivePortal.java
@@ -16,6 +16,7 @@
 package android.net;
 
 import android.annotation.NonNull;
+import android.annotation.RequiresPermission;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
 import android.os.IBinder;
@@ -153,6 +154,7 @@
      */
     @SystemApi
     @TestApi
+    @RequiresPermission(android.Manifest.permission.NETWORK_STACK)
     public void reevaluateNetwork() {
         try {
             ICaptivePortal.Stub.asInterface(mBinder).appRequest(APP_REQUEST_REEVALUATION_REQUIRED);

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 9d30222..e2b8ad9 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3739,6 +3739,7 @@
             if (nm == null) return;
 
             if (request == CaptivePortal.APP_REQUEST_REEVALUATION_REQUIRED) {
+                checkNetworkStackPermission();
                 nm.forceReevaluation(Binder.getCallingUid());
             }
         }