Merge "Add @UnsupportedAppUsage annotations for max-p." am: f2016651b6

am: 1c1501f3bf

Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
This commit is contained in:
Artur Satayev
2019-11-08 09:49:03 -08:00
committed by android-build-merger

View File

@@ -52,6 +52,7 @@ interface IConnectivityManager
@UnsupportedAppUsage @UnsupportedAppUsage
NetworkInfo getActiveNetworkInfo(); NetworkInfo getActiveNetworkInfo();
NetworkInfo getActiveNetworkInfoForUid(int uid, boolean ignoreBlocked); NetworkInfo getActiveNetworkInfoForUid(int uid, boolean ignoreBlocked);
@UnsupportedAppUsage(maxTargetSdk = 28)
NetworkInfo getNetworkInfo(int networkType); NetworkInfo getNetworkInfo(int networkType);
NetworkInfo getNetworkInfoForUid(in Network network, int uid, boolean ignoreBlocked); NetworkInfo getNetworkInfoForUid(in Network network, int uid, boolean ignoreBlocked);
@UnsupportedAppUsage @UnsupportedAppUsage
@@ -112,6 +113,7 @@ interface IConnectivityManager
int setUsbTethering(boolean enable, String callerPkg); int setUsbTethering(boolean enable, String callerPkg);
@UnsupportedAppUsage(maxTargetSdk = 28)
void reportInetCondition(int networkType, int percentage); void reportInetCondition(int networkType, int percentage);
void reportNetworkConnectivity(in Network network, boolean hasConnectivity); void reportNetworkConnectivity(in Network network, boolean hasConnectivity);