From b665970f8dcf4472bdf877eceba10689435bddf1 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 12 Feb 2020 13:44:50 +0800 Subject: [PATCH] Add permission check for CaptivePortal#reevaluateNetwork CaptivePortal#reevaluateNetwork is added as a system API which requires a proper permission check. Bug: 148379628 Test: Manually check with captive portal Test: atest FrameworksNetTests Test: make test-api-stubs-docs-update-current-api \ system-api-stubs-docs-update-current-api Change-Id: I3f974339d5bd53a6f6ecb0842c02a8264dc3a5f9 Merged-In: I559d42089aeb09801d14c251c5165fca793c3cb3 --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/net/CaptivePortal.java | 2 ++ services/core/java/com/android/server/ConnectivityService.java | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 33c98c3a85074..43a08769f2d8e 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4361,7 +4361,7 @@ package android.net { public class CaptivePortal implements android.os.Parcelable { method public void logEvent(int, @NonNull String); - method public void reevaluateNetwork(); + method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork(); method public void useNetwork(); field public static final int APP_REQUEST_REEVALUATION_REQUIRED = 100; // 0x64 field public static final int APP_RETURN_DISMISSED = 0; // 0x0 diff --git a/api/test-current.txt b/api/test-current.txt index 711aaac878677..a4301c3cba938 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1398,7 +1398,7 @@ package android.net { public class CaptivePortal implements android.os.Parcelable { method public void logEvent(int, @NonNull String); - method public void reevaluateNetwork(); + method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork(); method public void useNetwork(); field public static final int APP_REQUEST_REEVALUATION_REQUIRED = 100; // 0x64 field public static final int APP_RETURN_DISMISSED = 0; // 0x0 diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java index fb35b4bde3039..448fe5a0511e4 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 @@ public class CaptivePortal implements Parcelable { */ @SystemApi @TestApi + @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork() { try { ICaptivePortal.Stub.asInterface(mBinder).appRequest(APP_REQUEST_REEVALUATION_REQUIRED); diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index b3b17226648df..3433ef0a65adb 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3744,6 +3744,7 @@ public class ConnectivityService extends IConnectivityManager.Stub if (nm == null) return; if (request == CaptivePortal.APP_REQUEST_REEVALUATION_REQUIRED) { + checkNetworkStackPermission(); nm.forceReevaluation(Binder.getCallingUid()); } }