Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5e78ea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: 4940da0b 

Change-Id: I2f9de2582025c8fc3782870b8c561ce2002abaf8
parents 438129f4 4940da0b

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4368,7 +4368,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

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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

































core/java/android/net/CaptivePortal.java



+2
−0




























Original line number
Diff line number
Diff line








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

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -3739,6 +3739,7 @@ public class ConnectivityService extends IConnectivityManager.Stub













            if (nm == null) return;































            if (request == CaptivePortal.APP_REQUEST_REEVALUATION_REQUIRED) {













                checkNetworkStackPermission();















                nm.forceReevaluation(Binder.getCallingUid());















            }















        }