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

config/hiddenapi-light-greylist.txt

+0 −306

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −27

Original line number	Diff line number	Diff line
		@@ -333,19 +333,8 @@ Lcom/android/ims/internal/uce/uceservice/IUceService;->getServiceStatus()Z
		Lcom/android/ims/internal/uce/uceservice/IUceService;->isServiceStarted()Z
		Lcom/android/ims/internal/uce/uceservice/IUceService;->startService(Lcom/android/ims/internal/uce/uceservice/IUceListener;)Z
		Lcom/android/ims/internal/uce/uceservice/IUceService;->stopService()Z
		Lcom/android/internal/app/AlertController$AlertParams;->mIconId:I
		Lcom/android/internal/app/AlertController$AlertParams;->mMessage:Ljava/lang/CharSequence;
		Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener;
		Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence;
		Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener;
		Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence;
		Lcom/android/internal/app/AlertController$AlertParams;->mTitle:Ljava/lang/CharSequence;
		Lcom/android/internal/app/AlertController$AlertParams;->mView:Landroid/view/View;
		Lcom/android/internal/app/AlertController;->getButton(I)Landroid/widget/Button;
		Lcom/android/internal/app/IAppOpsService;->finishOperation(Landroid/os/IBinder;IILjava/lang/String;)V
		Lcom/android/internal/content/PackageMonitor;-><init>()V
		Lcom/android/internal/content/PackageMonitor;->register(Landroid/content/Context;Landroid/os/Looper;Landroid/os/UserHandle;Z)V
		Lcom/android/internal/content/PackageMonitor;->unregister()V
		Lcom/android/internal/location/ILocationProvider$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProvider;
		Lcom/android/internal/location/ILocationProvider;->disable()V
		Lcom/android/internal/location/ILocationProvider;->enable()V
		@@ -354,14 +343,6 @@ Lcom/android/internal/location/ILocationProvider;->getStatus(Landroid/os/Bundle;
		Lcom/android/internal/location/ILocationProvider;->getStatusUpdateTime()J
		Lcom/android/internal/location/ILocationProvider;->sendExtraCommand(Ljava/lang/String;Landroid/os/Bundle;)Z
		Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V
		Lcom/android/internal/location/ProviderRequest;-><init>()V
		Lcom/android/internal/location/ProviderRequest;->interval:J
		Lcom/android/internal/location/ProviderRequest;->locationRequests:Ljava/util/List;
		Lcom/android/internal/location/ProviderRequest;->reportLocation:Z
		Lcom/android/internal/os/SomeArgs;->arg2:Ljava/lang/Object;
		Lcom/android/internal/os/SomeArgs;->arg3:Ljava/lang/Object;
		Lcom/android/internal/os/SomeArgs;->obtain()Lcom/android/internal/os/SomeArgs;
		Lcom/android/internal/os/SomeArgs;->recycle()V
		Lcom/android/internal/R$styleable;->NumberPicker:[I
		Lcom/android/internal/R$styleable;->TwoLineListItem:[I
		Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BII)Ljava/lang/String;
		@@ -375,14 +356,6 @@ Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaLong()Ljava/lang/
		Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaShort()Ljava/lang/String;
		Lcom/android/internal/telephony/OperatorInfo;->getOperatorNumeric()Ljava/lang/String;
		Lcom/android/internal/telephony/OperatorInfo;->getState()Lcom/android/internal/telephony/OperatorInfo$State;
		Lcom/android/internal/util/AsyncChannel;-><init>()V
		Lcom/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Messenger;)V
		Lcom/android/internal/util/AsyncChannel;->sendMessage(Landroid/os/Message;)V
		Lcom/android/internal/util/IndentingPrintWriter;-><init>(Ljava/io/Writer;Ljava/lang/String;)V
		Lcom/android/internal/util/IndentingPrintWriter;->decreaseIndent()Lcom/android/internal/util/IndentingPrintWriter;
		Lcom/android/internal/util/IndentingPrintWriter;->increaseIndent()Lcom/android/internal/util/IndentingPrintWriter;
		Lcom/android/internal/util/XmlUtils;->beginDocument(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)V
		Lcom/android/internal/util/XmlUtils;->nextElement(Lorg/xmlpull/v1/XmlPullParser;)V
		Ljava/lang/System;->arraycopy([BI[BII)V
		Ljava/net/Inet4Address;->ALL:Ljava/net/InetAddress;
		Ljava/net/Inet4Address;->ANY:Ljava/net/InetAddress;

core/java/com/android/internal/app/AlertController.java

+52 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
		import com.android.internal.R;

		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.app.AlertDialog;
		import android.content.Context;
		import android.content.DialogInterface;
		@@ -71,9 +72,11 @@ public class AlertController {
		private final DialogInterface mDialogInterface;
		protected final Window mWindow;

		@UnsupportedAppUsage
		private CharSequence mTitle;
		protected CharSequence mMessage;
		protected ListView mListView;
		@UnsupportedAppUsage
		private View mView;

		private int mViewLayoutResId;
		@@ -107,8 +110,10 @@ public class AlertController {
		private MovementMethod mMessageMovementMethod;
		@Layout.HyphenationFrequency
		private Integer mMessageHyphenationFrequency;
		@UnsupportedAppUsage
		private View mCustomTitleView;

		@UnsupportedAppUsage
		private boolean mForceInverseBackground;

		private ListAdapter mAdapter;
		@@ -198,6 +203,7 @@ public class AlertController {
		}
		}

		@UnsupportedAppUsage
		protected AlertController(Context context, DialogInterface di, Window window) {
		mContext = context;
		mDialogInterface = di;
		@@ -258,6 +264,7 @@ public class AlertController {
		installContent();
		}

		@UnsupportedAppUsage
		public void installContent() {
		int contentView = selectContentView();
		mWindow.setContentView(contentView);
		@@ -275,6 +282,7 @@ public class AlertController {
		return mAlertDialogLayout;
		}

		@UnsupportedAppUsage
		public void setTitle(CharSequence title) {
		mTitle = title;
		if (mTitleView != null) {
		@@ -285,10 +293,12 @@ public class AlertController {
		/**
		* @see AlertDialog.Builder#setCustomTitle(View)
		*/
		@UnsupportedAppUsage
		public void setCustomTitle(View customTitleView) {
		mCustomTitleView = customTitleView;
		}

		@UnsupportedAppUsage
		public void setMessage(CharSequence message) {
		mMessage = message;
		if (mMessageView != null) {
		@@ -323,6 +333,7 @@ public class AlertController {
		/**
		* Set the view to display in the dialog.
		*/
		@UnsupportedAppUsage
		public void setView(View view) {
		mView = view;
		mViewLayoutResId = 0;
		@@ -362,6 +373,7 @@ public class AlertController {
		* @param listener The {@link DialogInterface.OnClickListener} to use.
		* @param msg The {@link Message} to be sent when clicked.
		*/
		@UnsupportedAppUsage
		public void setButton(int whichButton, CharSequence text,
		DialogInterface.OnClickListener listener, Message msg) {

		@@ -397,6 +409,7 @@ public class AlertController {
		* @param resId the resource identifier of the drawable to use as the icon,
		* or 0 for no icon
		*/
		@UnsupportedAppUsage
		public void setIcon(int resId) {
		mIcon = null;
		mIconId = resId;
		@@ -416,6 +429,7 @@ public class AlertController {
		*
		* @param icon the drawable to use as the icon or null for no icon
		*/
		@UnsupportedAppUsage
		public void setIcon(Drawable icon) {
		mIcon = icon;
		mIconId = 0;
		@@ -446,10 +460,12 @@ public class AlertController {
		mForceInverseBackground = forceInverseBackground;
		}

		@UnsupportedAppUsage
		public ListView getListView() {
		return mListView;
		}

		@UnsupportedAppUsage
		public Button getButton(int whichButton) {
		switch (whichButton) {
		case DialogInterface.BUTTON_POSITIVE:
		@@ -464,11 +480,13 @@ public class AlertController {
		}

		@SuppressWarnings({"UnusedDeclaration"})
		@UnsupportedAppUsage
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		return mScrollView != null && mScrollView.executeKeyEvent(event);
		}

		@SuppressWarnings({"UnusedDeclaration"})
		@UnsupportedAppUsage
		public boolean onKeyUp(int keyCode, KeyEvent event) {
		return mScrollView != null && mScrollView.executeKeyEvent(event);
		}
		@@ -932,10 +950,12 @@ public class AlertController {

		boolean mRecycleOnMeasure = true;

		@UnsupportedAppUsage
		public RecycleListView(Context context) {
		this(context, null);
		}

		@UnsupportedAppUsage
		public RecycleListView(Context context, AttributeSet attrs) {
		super(context, attrs);

		@@ -964,44 +984,74 @@ public class AlertController {
		}

		public static class AlertParams {
		@UnsupportedAppUsage
		public final Context mContext;
		@UnsupportedAppUsage
		public final LayoutInflater mInflater;

		@UnsupportedAppUsage
		public int mIconId = 0;
		@UnsupportedAppUsage
		public Drawable mIcon;
		public int mIconAttrId = 0;
		@UnsupportedAppUsage
		public CharSequence mTitle;
		@UnsupportedAppUsage
		public View mCustomTitleView;
		@UnsupportedAppUsage
		public CharSequence mMessage;
		@UnsupportedAppUsage
		public CharSequence mPositiveButtonText;
		@UnsupportedAppUsage
		public DialogInterface.OnClickListener mPositiveButtonListener;
		@UnsupportedAppUsage
		public CharSequence mNegativeButtonText;
		@UnsupportedAppUsage
		public DialogInterface.OnClickListener mNegativeButtonListener;
		@UnsupportedAppUsage
		public CharSequence mNeutralButtonText;
		@UnsupportedAppUsage
		public DialogInterface.OnClickListener mNeutralButtonListener;
		@UnsupportedAppUsage
		public boolean mCancelable;
		@UnsupportedAppUsage
		public DialogInterface.OnCancelListener mOnCancelListener;
		@UnsupportedAppUsage
		public DialogInterface.OnDismissListener mOnDismissListener;
		@UnsupportedAppUsage
		public DialogInterface.OnKeyListener mOnKeyListener;
		@UnsupportedAppUsage
		public CharSequence[] mItems;
		@UnsupportedAppUsage
		public ListAdapter mAdapter;
		@UnsupportedAppUsage
		public DialogInterface.OnClickListener mOnClickListener;
		public int mViewLayoutResId;
		@UnsupportedAppUsage
		public View mView;
		public int mViewSpacingLeft;
		public int mViewSpacingTop;
		public int mViewSpacingRight;
		public int mViewSpacingBottom;
		public boolean mViewSpacingSpecified = false;
		@UnsupportedAppUsage
		public boolean[] mCheckedItems;
		@UnsupportedAppUsage
		public boolean mIsMultiChoice;
		@UnsupportedAppUsage
		public boolean mIsSingleChoice;
		@UnsupportedAppUsage
		public int mCheckedItem = -1;
		@UnsupportedAppUsage
		public DialogInterface.OnMultiChoiceClickListener mOnCheckboxClickListener;
		@UnsupportedAppUsage
		public Cursor mCursor;
		@UnsupportedAppUsage
		public String mLabelColumn;
		@UnsupportedAppUsage
		public String mIsCheckedColumn;
		public boolean mForceInverseBackground;
		@UnsupportedAppUsage
		public AdapterView.OnItemSelectedListener mOnItemSelectedListener;
		public OnPrepareListViewListener mOnPrepareListViewListener;
		public boolean mRecycleOnMeasure = true;
		@@ -1019,12 +1069,14 @@ public class AlertController {
		void onPrepareListView(ListView listView);
		}

		@UnsupportedAppUsage
		public AlertParams(Context context) {
		mContext = context;
		mCancelable = true;
		mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		}

		@UnsupportedAppUsage
		public void apply(AlertController dialog) {
		if (mCustomTitleView != null) {
		dialog.setCustomTitle(mCustomTitleView);

core/java/com/android/internal/content/PackageMonitor.java

+8 −0

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

		package com.android.internal.content;

		import android.annotation.UnsupportedAppUsage;
		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		@@ -70,10 +71,12 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {

		String[] mTempArray = new String[1];

		@UnsupportedAppUsage
		public void register(Context context, Looper thread, boolean externalStorage) {
		register(context, thread, null, externalStorage);
		}

		@UnsupportedAppUsage
		public void register(Context context, Looper thread, UserHandle user,
		boolean externalStorage) {
		register(context, user, externalStorage,
		@@ -107,6 +110,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
		return mRegisteredHandler;
		}

		@UnsupportedAppUsage
		public void unregister() {
		if (mRegisteredContext == null) {
		throw new IllegalStateException("Not registered");
		@@ -134,6 +138,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
		/**
		* Called when a package is really removed (and not replaced).
		*/
		@UnsupportedAppUsage
		public void onPackageRemoved(String packageName, int uid) {
		}

		@@ -167,6 +172,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
		* default implementation returns true if this is a change to the entire
		* package.
		*/
		@UnsupportedAppUsage
		public boolean onPackageChanged(String packageName, int uid, String[] components) {
		if (components != null) {
		for (String name : components) {
		@@ -246,6 +252,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
		return mAppearingPackages != null;
		}

		@UnsupportedAppUsage
		public int isPackageDisappearing(String packageName) {
		if (mDisappearingPackages != null) {
		for (int i=mDisappearingPackages.length-1; i>=0; i--) {
		@@ -265,6 +272,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
		return mChangeType == PACKAGE_UPDATING;
		}

		@UnsupportedAppUsage
		public boolean isPackageModified(String packageName) {
		if (mModifiedPackages != null) {
		for (int i=mModifiedPackages.length-1; i>=0; i--) {

core/java/com/android/internal/content/ReferrerIntent.java

+3 −0

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

		package com.android.internal.content;

		import android.annotation.UnsupportedAppUsage;
		import android.content.Intent;
		import android.os.Parcel;

		@@ -25,8 +26,10 @@ import java.util.Objects;
		* Subclass of Intent that also contains referrer (as a package name) information.
		*/
		public class ReferrerIntent extends Intent {
		@UnsupportedAppUsage
		public final String mReferrer;

		@UnsupportedAppUsage
		public ReferrerIntent(Intent baseIntent, String referrer) {
		super(baseIntent);
		mReferrer = referrer;