Merge "Restrict access to dangerous methods to <= P" (ae8548df) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/net/TrafficStats.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.app.backup.BackupManager;
		import android.app.usage.NetworkStatsManager;
		import android.content.Context;
		import android.media.MediaPlayer;
		import android.os.Build;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.DataUnit;
		@@ -150,7 +151,7 @@ public class TrafficStats {

		private static INetworkStatsService sStatsService;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
		private synchronized static INetworkStatsService getStatsService() {
		if (sStatsService == null) {
		sStatsService = INetworkStatsService.Stub.asInterface(
		@@ -960,7 +961,7 @@ public class TrafficStats {
		* Interfaces are never removed from this list, so counters should always be
		* monotonic.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
		private static String[] getMobileIfaces() {
		try {
		return getStatsService().getMobileIfaces();