Merge "Restrict RemoteViews unsupported app usage" (cc2237d2) · Commits · e / os / android_frameworks_base

core/java/android/widget/RemoteViews.java

+19 −18

Original line number	Diff line number	Diff line
		@@ -206,13 +206,13 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public ApplicationInfo mApplication;

		/**
		* The resource ID of the layout file. (Added to the parcel)
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private final int mLayoutId;

		/**
		@@ -224,13 +224,13 @@ public class RemoteViews implements Parcelable, Filter {
		* An array of actions to perform on the view tree once it has been
		* inflated
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private ArrayList<Action> mActions;

		/**
		* Maps bitmaps to unique indicies to avoid Bitmap duplication.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private BitmapCache mBitmapCache;

		/**
		@@ -252,7 +252,7 @@ public class RemoteViews implements Parcelable, Filter {
		* RemoteViews.
		*/
		private RemoteViews mLandscape = null;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private RemoteViews mPortrait = null;

		@ApplyFlags
		@@ -430,7 +430,7 @@ public class RemoteViews implements Parcelable, Filter {
		// Do nothing
		}

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public int mergeBehavior() {
		return MERGE_REPLACE;
		}
		@@ -466,7 +466,7 @@ public class RemoteViews implements Parcelable, Filter {
		// Nothing to visit by default
		}

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		int viewId;
		}

		@@ -499,7 +499,7 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public void mergeRemoteViews(RemoteViews newRv) {
		if (newRv == null) return;
		// We first copy the new RemoteViews, as the process of merging modifies the way the actions
		@@ -690,7 +690,7 @@ public class RemoteViews implements Parcelable, Filter {
		return SET_PENDING_INTENT_TEMPLATE_TAG;
		}

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		PendingIntent pendingIntentTemplate;
		}

		@@ -1138,7 +1138,7 @@ public class RemoteViews implements Parcelable, Filter {

		private static class BitmapCache {

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		ArrayList<Bitmap> mBitmaps;
		int mBitmapMemory = -1;

		@@ -1190,9 +1190,9 @@ public class RemoteViews implements Parcelable, Filter {

		private class BitmapReflectionAction extends Action {
		int bitmapId;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		Bitmap bitmap;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		String methodName;

		BitmapReflectionAction(int viewId, String methodName, Bitmap bitmap) {
		@@ -1258,10 +1258,10 @@ public class RemoteViews implements Parcelable, Filter {
		static final int COLOR_STATE_LIST = 15;
		static final int ICON = 16;

		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		String methodName;
		int type;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		Object value;

		ReflectionAction(int viewId, String methodName, int type, Object value) {
		@@ -1554,7 +1554,7 @@ public class RemoteViews implements Parcelable, Filter {
		* ViewGroup methods that are related to adding Views.
		*/
		private class ViewGroupActionAdd extends Action {
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private RemoteViews mNestedViews;
		private int mIndex;

		@@ -2469,7 +2469,7 @@ public class RemoteViews implements Parcelable, Filter {
		* Returns an estimate of the bitmap heap memory usage for this RemoteViews.
		*/
		/** @hide */
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public int estimateMemoryUsage() {
		return mBitmapCache.getBitmapMemory();
		}
		@@ -2517,7 +2517,7 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public void addView(int viewId, RemoteViews nestedView, int index) {
		addAction(new ViewGroupActionAdd(viewId, nestedView, index));
		}
		@@ -2992,8 +2992,9 @@ public class RemoteViews implements Parcelable, Filter {
		* See {@link Adapter#getViewTypeCount()}.
		*
		* @hide
		* @deprecated this appears to have no users outside of UnsupportedAppUsage?
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		public void setRemoteAdapter(int viewId, ArrayList<RemoteViews> list, int viewTypeCount) {
		addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount));
		}