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

Restrict access to dangerous methods to <= P

Browse Source 
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45
This commit is contained in:
Chalard Jean
2019-04-09 15:46:21 +09:00
parent 3753f67bcd
commit a3b77516bc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,7 +510,7 @@ public class ConnectivityManager {
* The absence of a connection type. * The absence of a connection type.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static final int TYPE_NONE = -1; public static final int TYPE_NONE = -1;
/** /**
@@ -627,7 +627,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static final int TYPE_MOBILE_FOTA = 10; public static final int TYPE_MOBILE_FOTA = 10;
/** /**
@@ -645,7 +645,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static final int TYPE_MOBILE_CBS = 12; public static final int TYPE_MOBILE_CBS = 12;
/** /**
@@ -655,7 +655,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static final int TYPE_WIFI_P2P = 13; public static final int TYPE_WIFI_P2P = 13;
/** /**
@@ -674,7 +674,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static final int TYPE_MOBILE_EMERGENCY = 15; public static final int TYPE_MOBILE_EMERGENCY = 15;
/** /**
@@ -775,7 +775,7 @@ public class ConnectivityManager {
*/ */
public static final String PRIVATE_DNS_DEFAULT_MODE_FALLBACK = PRIVATE_DNS_MODE_OPPORTUNISTIC; public static final String PRIVATE_DNS_DEFAULT_MODE_FALLBACK = PRIVATE_DNS_MODE_OPPORTUNISTIC;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
private final IConnectivityManager mService; private final IConnectivityManager mService;
/** /**
* A kludge to facilitate static access where a Context pointer isn't available, like in the * A kludge to facilitate static access where a Context pointer isn't available, like in the
@@ -867,7 +867,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public static boolean isNetworkTypeMobile(int networkType) { public static boolean isNetworkTypeMobile(int networkType) {
switch (networkType) { switch (networkType) {
case TYPE_MOBILE: case TYPE_MOBILE:
@@ -1304,7 +1304,7 @@ public class ConnectivityManager {
*/ */
@Deprecated @Deprecated
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public LinkProperties getLinkProperties(int networkType) { public LinkProperties getLinkProperties(int networkType) {
try { try {
return mService.getLinkPropertiesForType(networkType); return mService.getLinkPropertiesForType(networkType);
@@ -3042,7 +3042,7 @@ public class ConnectivityManager {
*/ */
@Deprecated @Deprecated
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
public boolean isNetworkSupported(int networkType) { public boolean isNetworkSupported(int networkType) {
try { try {
return mService.isNetworkSupported(networkType); return mService.isNetworkSupported(networkType);