Merge "Restrict access to dangerous methods to <= P"
am: 861e9b56bd
Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0
This commit is contained in:
@@ -510,7 +510,7 @@ public class ConnectivityManager {
|
||||
* The absence of a connection type.
|
||||
* @hide
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public static final int TYPE_NONE = -1;
|
||||
|
||||
/**
|
||||
@@ -627,7 +627,7 @@ public class ConnectivityManager {
|
||||
* {@hide}
|
||||
*/
|
||||
@Deprecated
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public static final int TYPE_MOBILE_FOTA = 10;
|
||||
|
||||
/**
|
||||
@@ -645,7 +645,7 @@ public class ConnectivityManager {
|
||||
* {@hide}
|
||||
*/
|
||||
@Deprecated
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public static final int TYPE_MOBILE_CBS = 12;
|
||||
|
||||
/**
|
||||
@@ -655,7 +655,7 @@ public class ConnectivityManager {
|
||||
* {@hide}
|
||||
*/
|
||||
@Deprecated
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public static final int TYPE_WIFI_P2P = 13;
|
||||
|
||||
/**
|
||||
@@ -674,7 +674,7 @@ public class ConnectivityManager {
|
||||
* {@hide}
|
||||
*/
|
||||
@Deprecated
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
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;
|
||||
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
private final IConnectivityManager mService;
|
||||
/**
|
||||
* A kludge to facilitate static access where a Context pointer isn't available, like in the
|
||||
@@ -867,7 +867,7 @@ public class ConnectivityManager {
|
||||
* {@hide}
|
||||
*/
|
||||
@Deprecated
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public static boolean isNetworkTypeMobile(int networkType) {
|
||||
switch (networkType) {
|
||||
case TYPE_MOBILE:
|
||||
@@ -1304,7 +1304,7 @@ public class ConnectivityManager {
|
||||
*/
|
||||
@Deprecated
|
||||
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public LinkProperties getLinkProperties(int networkType) {
|
||||
try {
|
||||
return mService.getLinkPropertiesForType(networkType);
|
||||
@@ -3042,7 +3042,7 @@ public class ConnectivityManager {
|
||||
*/
|
||||
@Deprecated
|
||||
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
||||
@UnsupportedAppUsage
|
||||
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
|
||||
public boolean isNetworkSupported(int networkType) {
|
||||
try {
|
||||
return mService.isNetworkSupported(networkType);
|
||||
|
||||
Reference in New Issue
Block a user