Merge "Add @UnsupportedAppUsage annotations" (a25b4e8c) · Commits · e / os / android_frameworks_base

config/hiddenapi-greylist.txt

+0 −38

Original line number	Diff line number	Diff line
		@@ -592,41 +592,13 @@ Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/la
		Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String;
		Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
		Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager;
		Landroid/net/IConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;
		Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
		Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo;
		Landroid/net/IConnectivityManager;->getAllNetworkState()[Landroid/net/NetworkState;
		Landroid/net/IConnectivityManager;->getLastTetherError(Ljava/lang/String;)I
		Landroid/net/IConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;
		Landroid/net/IConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;
		Landroid/net/IConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;
		Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;
		Landroid/net/IConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;
		Landroid/net/IConnectivityManager;->startLegacyVpn(Lcom/android/internal/net/VpnProfile;)V
		Landroid/net/INetworkManagementEventObserver$Stub;-><init>()V
		Landroid/net/INetworkPolicyListener$Stub;-><init>()V
		Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager;
		Landroid/net/INetworkPolicyManager;->getNetworkQuotaInfo(Landroid/net/NetworkState;)Landroid/net/NetworkQuotaInfo;
		Landroid/net/INetworkPolicyManager;->getRestrictBackground()Z
		Landroid/net/INetworkPolicyManager;->getUidPolicy(I)I
		Landroid/net/INetworkPolicyManager;->setNetworkPolicies([Landroid/net/NetworkPolicy;)V
		Landroid/net/INetworkPolicyManager;->setRestrictBackground(Z)V
		Landroid/net/INetworkPolicyManager;->setUidPolicy(II)V
		Landroid/net/INetworkPolicyManager;->snoozeLimit(Landroid/net/NetworkTemplate;)V
		Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkScoreService;
		Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String;
		Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService;
		Landroid/net/INetworkStatsService;->forceUpdate()V
		Landroid/net/INetworkStatsService;->getDataLayerSnapshotForUid(I)Landroid/net/NetworkStats;
		Landroid/net/INetworkStatsService;->getMobileIfaces()[Ljava/lang/String;
		Landroid/net/INetworkStatsService;->openSession()Landroid/net/INetworkStatsSession;
		Landroid/net/INetworkStatsService;->openSessionForUsageStats(ILjava/lang/String;)Landroid/net/INetworkStatsSession;
		Landroid/net/INetworkStatsSession;->close()V
		Landroid/net/INetworkStatsSession;->getHistoryForNetwork(Landroid/net/NetworkTemplate;I)Landroid/net/NetworkStatsHistory;
		Landroid/net/INetworkStatsSession;->getHistoryForUid(Landroid/net/NetworkTemplate;IIII)Landroid/net/NetworkStatsHistory;
		Landroid/net/INetworkStatsSession;->getSummaryForAllUid(Landroid/net/NetworkTemplate;JJZ)Landroid/net/NetworkStats;
		Landroid/net/INetworkStatsSession;->getSummaryForNetwork(Landroid/net/NetworkTemplate;JJ)Landroid/net/NetworkStats;
		Landroid/net/InterfaceConfiguration;-><init>()V
		Landroid/net/LinkProperties$ProvisioningChange;->values()[Landroid/net/LinkProperties$ProvisioningChange;
		Landroid/net/MobileLinkQualityInfo;-><init>()V
		@@ -637,22 +609,12 @@ Landroid/net/SntpClient;-><init>()V
		Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager;
		Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I
		Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;
		Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;
		Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I
		Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder;
		Landroid/net/wifi/IWifiScanner$Stub;-><init>()V
		Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner;
		Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/p2p/IWifiP2pManager;
		Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I
		Landroid/nfc/INfcAdapterExtras;->authenticate(Ljava/lang/String;[B)V
		Landroid/nfc/INfcAdapterExtras;->close(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;
		Landroid/nfc/INfcAdapterExtras;->getCardEmulationRoute(Ljava/lang/String;)I
		Landroid/nfc/INfcAdapterExtras;->getDriverName(Ljava/lang/String;)Ljava/lang/String;
		Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;
		Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V
		Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle;
		Landroid/os/AsyncResult;-><init>(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Throwable;)V
		Landroid/os/AsyncResult;->exception:Ljava/lang/Throwable;
		Landroid/os/AsyncResult;->forMessage(Landroid/os/Message;)Landroid/os/AsyncResult;

core/java/android/net/IConnectivityManager.aidl

+11 −0

Original line number	Diff line number	Diff line
		@@ -47,10 +47,12 @@ interface IConnectivityManager
		{
		Network getActiveNetwork();
		Network getActiveNetworkForUid(int uid, boolean ignoreBlocked);
		@UnsupportedAppUsage
		NetworkInfo getActiveNetworkInfo();
		NetworkInfo getActiveNetworkInfoForUid(int uid, boolean ignoreBlocked);
		NetworkInfo getNetworkInfo(int networkType);
		NetworkInfo getNetworkInfoForUid(in Network network, int uid, boolean ignoreBlocked);
		@UnsupportedAppUsage
		NetworkInfo[] getAllNetworkInfo();
		Network getNetworkForType(int networkType);
		Network[] getAllNetworks();
		@@ -58,12 +60,14 @@ interface IConnectivityManager

		boolean isNetworkSupported(int networkType);

		@UnsupportedAppUsage
		LinkProperties getActiveLinkProperties();
		LinkProperties getLinkPropertiesForType(int networkType);
		LinkProperties getLinkProperties(in Network network);

		NetworkCapabilities getNetworkCapabilities(in Network network);

		@UnsupportedAppUsage
		NetworkState[] getAllNetworkState();

		NetworkQuotaInfo getActiveNetworkQuotaInfo();
		@@ -75,6 +79,7 @@ interface IConnectivityManager

		int untether(String iface, String callerPkg);

		@UnsupportedAppUsage
		int getLastTetherError(String iface);

		boolean isTetheringSupported(String callerPkg);
		@@ -84,16 +89,21 @@ interface IConnectivityManager

		void stopTethering(int type, String callerPkg);

		@UnsupportedAppUsage
		String[] getTetherableIfaces();

		@UnsupportedAppUsage
		String[] getTetheredIfaces();

		@UnsupportedAppUsage
		String[] getTetheringErroredIfaces();

		String[] getTetheredDhcpRanges();

		@UnsupportedAppUsage
		String[] getTetherableUsbRegexs();

		@UnsupportedAppUsage
		String[] getTetherableWifiRegexs();

		String[] getTetherableBluetoothRegexs();
		@@ -118,6 +128,7 @@ interface IConnectivityManager

		VpnConfig getVpnConfig(int userId);

		@UnsupportedAppUsage
		void startLegacyVpn(in VpnProfile profile);

		LegacyVpnInfo getLegacyVpnInfo(int userId);

core/java/android/net/INetworkPolicyManager.aidl

+7 −0

Original line number	Diff line number	Diff line
		@@ -31,9 +31,11 @@ import android.telephony.SubscriptionPlan;
		interface INetworkPolicyManager {

		/** Control UID policies. */
		@UnsupportedAppUsage
		void setUidPolicy(int uid, int policy);
		void addUidPolicy(int uid, int policy);
		void removeUidPolicy(int uid, int policy);
		@UnsupportedAppUsage
		int getUidPolicy(int uid);
		int[] getUidsWithPolicy(int policy);

		@@ -41,14 +43,18 @@ interface INetworkPolicyManager {
		void unregisterListener(INetworkPolicyListener listener);

		/** Control network policies atomically. */
		@UnsupportedAppUsage
		void setNetworkPolicies(in NetworkPolicy[] policies);
		NetworkPolicy[] getNetworkPolicies(String callingPackage);

		/** Snooze limit on policy matching given template. */
		@UnsupportedAppUsage
		void snoozeLimit(in NetworkTemplate template);

		/** Control if background data is restricted system-wide. */
		@UnsupportedAppUsage
		void setRestrictBackground(boolean restrictBackground);
		@UnsupportedAppUsage
		boolean getRestrictBackground();

		/** Callback used to change internal state on tethering */
		@@ -64,6 +70,7 @@ interface INetworkPolicyManager {
		void setDeviceIdleMode(boolean enabled);
		void setWifiMeteredOverride(String networkId, int meteredOverride);

		@UnsupportedAppUsage
		NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state);

		SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage);

core/java/android/net/INetworkStatsService.aidl

+5 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.internal.net.VpnInfo;
		interface INetworkStatsService {

		/** Start a statistics query session. */
		@UnsupportedAppUsage
		INetworkStatsSession openSession();

		/** Start a statistics query session. If calling package is profile or device owner then it is
		@@ -39,9 +40,11 @@ interface INetworkStatsService {
		* PACKAGE_USAGE_STATS permission is always checked. If PACKAGE_USAGE_STATS is not granted
		* READ_NETWORK_USAGE_STATS is checked for.
		*/
		@UnsupportedAppUsage
		INetworkStatsSession openSessionForUsageStats(int flags, String callingPackage);

		/** Return data layer snapshot of UID network usage. */
		@UnsupportedAppUsage
		NetworkStats getDataLayerSnapshotForUid(int uid);

		/** Get a detailed snapshot of stats since boot for all UIDs.
		@@ -54,6 +57,7 @@ interface INetworkStatsService {
		NetworkStats getDetailedUidStats(in String[] requiredIfaces);

		/** Return set of any ifaces associated with mobile networks since boot. */
		@UnsupportedAppUsage
		String[] getMobileIfaces();

		/** Increment data layer count of operations performed for UID and tag. */
		@@ -66,6 +70,7 @@ interface INetworkStatsService {
		in NetworkState[] networkStates,
		in String activeIface);
		/** Force update of statistics. */
		@UnsupportedAppUsage
		void forceUpdate();

		/** Registers a callback on data usage. */

core/java/android/net/INetworkStatsSession.aidl

+5 −0

Original line number	Diff line number	Diff line
		@@ -27,13 +27,17 @@ interface INetworkStatsSession {
		NetworkStats getDeviceSummaryForNetwork(in NetworkTemplate template, long start, long end);

		/** Return network layer usage summary for traffic that matches template. */
		@UnsupportedAppUsage
		NetworkStats getSummaryForNetwork(in NetworkTemplate template, long start, long end);
		/** Return historical network layer stats for traffic that matches template. */
		@UnsupportedAppUsage
		NetworkStatsHistory getHistoryForNetwork(in NetworkTemplate template, int fields);

		/** Return network layer usage summary per UID for traffic that matches template. */
		@UnsupportedAppUsage
		NetworkStats getSummaryForAllUid(in NetworkTemplate template, long start, long end, boolean includeTags);
		/** Return historical network layer stats for specific UID traffic that matches template. */
		@UnsupportedAppUsage
		NetworkStatsHistory getHistoryForUid(in NetworkTemplate template, int uid, int set, int tag, int fields);
		/** Return historical network layer stats for specific UID traffic that matches template. */
		NetworkStatsHistory getHistoryIntervalForUid(in NetworkTemplate template, int uid, int set, int tag, int fields, long start, long end);
		@@ -41,6 +45,7 @@ interface INetworkStatsSession {
		/** Return array of uids that have stats and are accessible to the calling user */
		int[] getRelevantUids();

		@UnsupportedAppUsage
		void close();

		}