LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix API in CaptivePortal and ConnectivityManager"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-25 02:37:28 +00:00
committed by Gerrit Code Review
parent 07461c335b 1fb7cabbfc
commit 8f4c739827
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,8 +64,6 @@ public class CaptivePortal implements Parcelable {
private final IBinder mBinder; private final IBinder mBinder;
/** @hide */ /** @hide */
@SystemApi
@TestApi
public CaptivePortal(@NonNull IBinder binder) { public CaptivePortal(@NonNull IBinder binder) {
mBinder = binder; mBinder = binder;
} }

7
core/java/android/net/ConnectivityManager.java
View File

@@ -4101,9 +4101,12 @@ public class ConnectivityManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public boolean getAvoidBadWifi() { @RequiresPermission(anyOf = {
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
android.Manifest.permission.NETWORK_STACK})
public boolean shouldAvoidBadWifi() {
try { try {
return mService.getAvoidBadWifi(); return mService.shouldAvoidBadWifi();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -182,7 +182,7 @@ interface IConnectivityManager
void startCaptivePortalApp(in Network network); void startCaptivePortalApp(in Network network);
void startCaptivePortalAppInternal(in Network network, in Bundle appExtras); void startCaptivePortalAppInternal(in Network network, in Bundle appExtras);
boolean getAvoidBadWifi(); boolean shouldAvoidBadWifi();
int getMultipathPreference(in Network Network); int getMultipathPreference(in Network Network);
NetworkRequest getDefaultRequest(); NetworkRequest getDefaultRequest();

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3475,8 +3475,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
return mMultinetworkPolicyTracker.getAvoidBadWifi(); return mMultinetworkPolicyTracker.getAvoidBadWifi();
} }
@Override /**
public boolean getAvoidBadWifi() { * Return whether the device should maintain continuous, working connectivity by switching away
* from WiFi networks having no connectivity.
* @see MultinetworkPolicyTracker#getAvoidBadWifi()
*/
public boolean shouldAvoidBadWifi() {
if (!checkNetworkStackPermission()) { if (!checkNetworkStackPermission()) {
throw new SecurityException("avoidBadWifi requires NETWORK_STACK permission"); throw new SecurityException("avoidBadWifi requires NETWORK_STACK permission");
} }