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

config/hiddenapi-light-greylist.txt

+0 −16

Original line number	Diff line number	Diff line
		@@ -964,22 +964,6 @@ Landroid/app/WallpaperManager;->openDefaultWallpaper(Landroid/content/Context;I)
		Landroid/app/WallpaperManager;->setBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;ZII)I
		Landroid/app/WallpaperManager;->setWallpaperComponent(Landroid/content/ComponentName;I)Z
		Landroid/app/WallpaperManager;->sGlobals:Landroid/app/WallpaperManager$Globals;
		Landroid/appwidget/AppWidgetHost;-><init>(Landroid/content/Context;ILandroid/widget/RemoteViews$OnClickHandler;Landroid/os/Looper;)V
		Landroid/appwidget/AppWidgetHost;->HANDLE_VIEW_DATA_CHANGED:I
		Landroid/appwidget/AppWidgetHost;->mHandler:Landroid/os/Handler;
		Landroid/appwidget/AppWidgetHost;->sService:Lcom/android/internal/appwidget/IAppWidgetService;
		Landroid/appwidget/AppWidgetHostView;->getDefaultPaddingForWidget(Landroid/content/Context;Landroid/content/pm/ApplicationInfo;Landroid/graphics/Rect;)Landroid/graphics/Rect;
		Landroid/appwidget/AppWidgetHostView;->mAppWidgetId:I
		Landroid/appwidget/AppWidgetHostView;->mInfo:Landroid/appwidget/AppWidgetProviderInfo;
		Landroid/appwidget/AppWidgetHostView;->updateAppWidgetSize(Landroid/os/Bundle;IIIIZ)V
		Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;)V
		Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;Landroid/os/Bundle;)V
		Landroid/appwidget/AppWidgetManager;->bindAppWidgetIdIfAllowed(IILandroid/content/ComponentName;Landroid/os/Bundle;)Z
		Landroid/appwidget/AppWidgetManager;->bindRemoteViewsService(Landroid/content/Context;ILandroid/content/Intent;Landroid/app/IServiceConnection;I)Z
		Landroid/appwidget/AppWidgetManager;->getInstalledProviders(I)Ljava/util/List;
		Landroid/appwidget/AppWidgetManager;->getInstalledProvidersForProfile(ILandroid/os/UserHandle;Ljava/lang/String;)Ljava/util/List;
		Landroid/appwidget/AppWidgetManager;->mService:Lcom/android/internal/appwidget/IAppWidgetService;
		Landroid/appwidget/AppWidgetProviderInfo;->providerInfo:Landroid/content/pm/ActivityInfo;
		Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String;
		Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I
		Landroid/bluetooth/IBluetooth$Stub;-><init>()V

core/java/android/appwidget/AppWidgetHost.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.appwidget;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.app.Activity;
		import android.content.ActivityNotFoundException;
		import android.content.Context;
		@@ -53,14 +54,17 @@ public class AppWidgetHost {
		static final int HANDLE_UPDATE = 1;
		static final int HANDLE_PROVIDER_CHANGED = 2;
		static final int HANDLE_PROVIDERS_CHANGED = 3;
		@UnsupportedAppUsage
		static final int HANDLE_VIEW_DATA_CHANGED = 4;

		final static Object sServiceLock = new Object();
		@UnsupportedAppUsage
		static IAppWidgetService sService;
		static boolean sServiceInitialized = false;
		private DisplayMetrics mDisplayMetrics;

		private String mContextOpPackageName;
		@UnsupportedAppUsage
		private final Handler mHandler;
		private final int mHostId;
		private final Callbacks mCallbacks;
		@@ -156,6 +160,7 @@ public class AppWidgetHost {
		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public AppWidgetHost(Context context, int hostId, OnClickHandler handler, Looper looper) {
		mContextOpPackageName = context.getOpPackageName();
		mHostId = hostId;

core/java/android/appwidget/AppWidgetHostView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.appwidget;

		import android.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		@@ -70,7 +71,9 @@ public class AppWidgetHostView extends FrameLayout {
		Context mContext;
		Context mRemoteContext;

		@UnsupportedAppUsage
		int mAppWidgetId;
		@UnsupportedAppUsage
		AppWidgetProviderInfo mInfo;
		View mView;
		int mViewMode = VIEW_MODE_NOINIT;
		@@ -174,6 +177,7 @@ public class AppWidgetHostView extends FrameLayout {
		return getDefaultPaddingForWidget(context, appInfo, padding);
		}

		@UnsupportedAppUsage
		private static Rect getDefaultPaddingForWidget(Context context, ApplicationInfo appInfo,
		Rect padding) {
		if (padding == null) {
		@@ -284,6 +288,7 @@ public class AppWidgetHostView extends FrameLayout {
		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth,
		int maxHeight, boolean ignorePadding) {
		if (newOptions == null) {

core/java/android/appwidget/AppWidgetManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.annotation.RequiresFeature;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemService;
		import android.annotation.UnsupportedAppUsage;
		import android.app.IServiceConnection;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		@@ -463,6 +464,7 @@ public class AppWidgetManager {

		private final Context mContext;
		private final String mPackageName;
		@UnsupportedAppUsage
		private final IAppWidgetService mService;
		private final DisplayMetrics mDisplayMetrics;

		@@ -816,6 +818,7 @@ public class AppWidgetManager {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {
		if (mService == null) {
		return Collections.emptyList();
		@@ -842,6 +845,7 @@ public class AppWidgetManager {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		public List<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter,
		@Nullable UserHandle profile, @Nullable String packageName) {
		if (mService == null) {
		@@ -902,6 +906,7 @@ public class AppWidgetManager {
		* provider for this AppWidget.
		* @hide
		*/
		@UnsupportedAppUsage
		public void bindAppWidgetId(int appWidgetId, ComponentName provider) {
		if (mService == null) {
		return;
		@@ -924,6 +929,7 @@ public class AppWidgetManager {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		public void bindAppWidgetId(int appWidgetId, ComponentName provider, Bundle options) {
		if (mService == null) {
		return;
		@@ -1094,6 +1100,7 @@ public class AppWidgetManager {
		* @see Context#getServiceDispatcher(ServiceConnection, Handler, int)
		* @hide
		*/
		@UnsupportedAppUsage
		public boolean bindRemoteViewsService(Context context, int appWidgetId, Intent intent,
		IServiceConnection connection, @Context.BindServiceFlags int flags) {
		if (mService == null) {
		@@ -1139,6 +1146,7 @@ public class AppWidgetManager {
		}
		}

		@UnsupportedAppUsage
		private boolean bindAppWidgetIdIfAllowed(int appWidgetId, int profileId,
		ComponentName provider, Bundle options) {
		if (mService == null) {

core/java/android/appwidget/AppWidgetProviderInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.appwidget;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.UnsupportedAppUsage;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -270,6 +271,7 @@ public class AppWidgetProviderInfo implements Parcelable {
		public int widgetFeatures;

		/** @hide */
		@UnsupportedAppUsage
		public ActivityInfo providerInfo;

		public AppWidgetProviderInfo() {