From b5962ae43190b1e2d78595ba3cfbc26d2bc0dac0 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Thu, 9 Aug 2018 15:15:57 +0100 Subject: Add @UnsupportedAppUsage annotations For packages: android.appwidget This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: I738f99248aaabe0ef29533e339ae7c5721384d52 Merged-In: Idbddc50320e7df92e0f260c1e309e5390b502d28 --- config/hiddenapi-light-greylist.txt | 16 ---------------- core/java/android/appwidget/AppWidgetHost.java | 5 +++++ core/java/android/appwidget/AppWidgetHostView.java | 5 +++++ core/java/android/appwidget/AppWidgetManager.java | 8 ++++++++ core/java/android/appwidget/AppWidgetProviderInfo.java | 2 ++ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 36b104714014..0993caa0224c 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1014,22 +1014,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;->(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;->()V diff --git a/core/java/android/appwidget/AppWidgetHost.java b/core/java/android/appwidget/AppWidgetHost.java index 49cc498cffa2..f003d4bea028 100644 --- a/core/java/android/appwidget/AppWidgetHost.java +++ b/core/java/android/appwidget/AppWidgetHost.java @@ -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; diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index ab0eb92e1726..a9187b65a359 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -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) { diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 20248b90d1e9..dbc1c199cb4d 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -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 getInstalledProviders(int categoryFilter) { if (mService == null) { return Collections.emptyList(); @@ -842,6 +845,7 @@ public class AppWidgetManager { * * @hide */ + @UnsupportedAppUsage public List 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) { diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java index 6dd85caad628..53315cce82dd 100644 --- a/core/java/android/appwidget/AppWidgetProviderInfo.java +++ b/core/java/android/appwidget/AppWidgetProviderInfo.java @@ -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() { -- cgit v1.2.3-59-g8ed1b