joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add permission check for CaptivePortal#reevaluateNetwork"

Browse source
This commit is contained in:
Chiachang Wang 2020-02-13 06:41:53 +00:00 • committed by Gerrit Code Review
commit d0f3cb625e
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/java/android/net/CaptivePortal.java
View file

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

1
services/core/java/com/android/server/ConnectivityService.java
View file

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