diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 07:09:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 07:09:24 +0000 |
| commit | b41fe0a9a3ea0ff5685a3ceef4b33f6367adf86e (patch) | |
| tree | e47d0833238559b7d06004c75d7c29805f18928a /core/java | |
| parent | b4a626361020474c9e568133c42a5c6cb6b8e91e (diff) | |
| parent | 8c5e78eae6cb5ec95e50751f1a8e87363e60e639 (diff) | |
Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b98 am: 8c5e78eae6
Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/CaptivePortal.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java index fb35b4bde303..448fe5a0511e 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); |