Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.
Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index 6fc0d74..0552d34 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -110,6 +110,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public static final int NAVIGATION_MODE_STANDARD = 0;
/**
@@ -122,6 +123,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public static final int NAVIGATION_MODE_LIST = 1;
/**
@@ -133,6 +135,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public static final int NAVIGATION_MODE_TABS = 2;
/** @hide */
@@ -340,6 +343,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void setListNavigationCallbacks(SpinnerAdapter adapter,
OnNavigationListener callback);
@@ -353,6 +357,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void setSelectedNavigationItem(int position);
/**
@@ -365,6 +370,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract int getSelectedNavigationIndex();
/**
@@ -377,6 +383,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract int getNavigationItemCount();
/**
@@ -579,6 +586,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
@NavigationMode
public abstract int getNavigationMode();
@@ -595,6 +603,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void setNavigationMode(@NavigationMode int mode);
/**
@@ -621,6 +630,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract Tab newTab();
/**
@@ -634,6 +644,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void addTab(Tab tab);
/**
@@ -647,6 +658,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void addTab(Tab tab, boolean setSelected);
/**
@@ -662,6 +674,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void addTab(Tab tab, int position);
/**
@@ -677,6 +690,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void addTab(Tab tab, int position, boolean setSelected);
/**
@@ -690,6 +704,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void removeTab(Tab tab);
/**
@@ -703,6 +718,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void removeTabAt(int position);
/**
@@ -713,6 +729,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void removeAllTabs();
/**
@@ -727,6 +744,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract void selectTab(Tab tab);
/**
@@ -740,6 +758,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract Tab getSelectedTab();
/**
@@ -753,6 +772,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract Tab getTabAt(int index);
/**
@@ -764,6 +784,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public abstract int getTabCount();
/**
@@ -1140,6 +1161,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public interface OnNavigationListener {
/**
* This method is called whenever a navigation item in your action bar
@@ -1177,6 +1199,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public static abstract class Tab {
/**
* An invalid position for a tab.
@@ -1333,6 +1356,7 @@
* <a href="http://developer.android.com/design/patterns/navigation.html">common
* navigation patterns</a> instead.
*/
+ @Deprecated
public interface TabListener {
/**
* Called when a tab enters the selected state.
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 31fe390..154e11b 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -3605,6 +3605,7 @@
*
* @deprecated Use {@link #getLockTaskModeState} instead.
*/
+ @Deprecated
public boolean isInLockTaskMode() {
return getLockTaskModeState() != LOCK_TASK_MODE_NONE;
}
diff --git a/core/java/android/app/FragmentController.java b/core/java/android/app/FragmentController.java
index b3d2df5..9ea15a0 100644
--- a/core/java/android/app/FragmentController.java
+++ b/core/java/android/app/FragmentController.java
@@ -120,6 +120,7 @@
*
* @deprecated use {@link #restoreAllState(Parcelable, FragmentManagerNonConfig)}
*/
+ @Deprecated
public void restoreAllState(Parcelable state, List<Fragment> nonConfigList) {
mHost.mFragmentManager.restoreAllState(state,
new FragmentManagerNonConfig(nonConfigList, null));
@@ -142,6 +143,7 @@
* @deprecated use {@link #retainNestedNonConfig()} to also track retained
* nested child fragments
*/
+ @Deprecated
public List<Fragment> retainNonConfig() {
return mHost.mFragmentManager.retainNonConfig().getFragments();
}
diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 3910657..505e081 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -123,6 +123,7 @@
* Handle returned by {@link KeyguardManager#newKeyguardLock} that allows
* you to disable / reenable the keyguard.
*/
+ @Deprecated
public class KeyguardLock {
private final IBinder mToken = new Binder();
private final String mTag;
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0cc44e7..3e9d409 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -220,6 +220,7 @@
*
* @deprecated this number is not shown anymore
*/
+ @Deprecated
public int number;
/**
@@ -487,6 +488,7 @@
*
* @deprecated Use {@link #priority} with a positive value.
*/
+ @Deprecated
public static final int FLAG_HIGH_PRIORITY = 0x00000080;
/**
@@ -2489,6 +2491,7 @@
*
* @deprecated this number is not shown anywhere anymore
*/
+ @Deprecated
public Builder setNumber(int number) {
mN.number = number;
return this;
@@ -2504,6 +2507,7 @@
* For legacy apps targeting a version below {@link android.os.Build.VERSION_CODES#N} this
* field will still show up, but the subtext will take precedence.
*/
+ @Deprecated
public Builder setContentInfo(CharSequence info) {
mN.extras.putCharSequence(EXTRA_INFO_TEXT, safeCharSequence(info));
return this;
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index a672d80..8db8dcf 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3009,6 +3009,7 @@
* TODO: delete once there are no longer any live references.
* @hide
*/
+ @Deprecated
public void setAlwaysOnVpnPackage(@NonNull ComponentName admin, @Nullable String vpnPackage)
throws NameNotFoundException, UnsupportedOperationException {
setAlwaysOnVpnPackage(admin, vpnPackage, /* lockdownEnabled */ true);
@@ -3758,6 +3759,7 @@
* @throws IllegalArgumentException if packageName is null, the package isn't installed, or
* the user has already been set up.
*/
+ @Deprecated
@SystemApi
public boolean setActiveProfileOwner(@NonNull ComponentName admin, @Deprecated String ownerName)
throws IllegalArgumentException {
diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java
index 800dd43..5419143 100644
--- a/core/java/android/bluetooth/BluetoothGatt.java
+++ b/core/java/android/bluetooth/BluetoothGatt.java
@@ -1045,6 +1045,7 @@
/**
* @deprecated Use {@link #abortReliableWrite()}
*/
+ @Deprecated
public void abortReliableWrite(BluetoothDevice mDevice) {
abortReliableWrite();
}
diff --git a/core/java/android/content/ClipboardManager.java b/core/java/android/content/ClipboardManager.java
index 1266f73..7244227 100644
--- a/core/java/android/content/ClipboardManager.java
+++ b/core/java/android/content/ClipboardManager.java
@@ -192,6 +192,7 @@
* @deprecated Use {@link #getPrimaryClip()} instead. This retrieves
* the primary clip and tries to coerce it to a string.
*/
+ @Deprecated
public CharSequence getText() {
ClipData clip = getPrimaryClip();
if (clip != null && clip.getItemCount() > 0) {
@@ -205,6 +206,7 @@
* creates a ClippedItem holding the given text and sets it as the
* primary clip. It has no label or icon.
*/
+ @Deprecated
public void setText(CharSequence text) {
setPrimaryClip(ClipData.newPlainText(null, text));
}
@@ -212,6 +214,7 @@
/**
* @deprecated Use {@link #hasPrimaryClip()} instead.
*/
+ @Deprecated
public boolean hasText() {
try {
return getService().hasClipboardText(mContext.getOpPackageName());
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 2edb4dc..e832eb5 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -4446,6 +4446,7 @@
* @deprecated As of API 21 this performs identically to
* {@link #FLAG_ACTIVITY_NEW_DOCUMENT} which should be used instead of this.
*/
+ @Deprecated
public static final int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET = 0x00080000;
/**
* This flag is used to open a document into a new task rooted at the activity launched
diff --git a/core/java/android/database/Cursor.java b/core/java/android/database/Cursor.java
index d10c9b8..5a4280e 100644
--- a/core/java/android/database/Cursor.java
+++ b/core/java/android/database/Cursor.java
@@ -348,6 +348,7 @@
* Calling {@link #requery} will make the cursor active again.
* @deprecated Since {@link #requery()} is deprecated, so too is this.
*/
+ @Deprecated
void deactivate();
/**
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index d06e08b..e289627 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -1995,6 +1995,7 @@
* @see CaptureRequest#CONTROL_SCENE_MODE
* @deprecated Please refer to this API documentation to find the alternatives
*/
+ @Deprecated
public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17;
/**
diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java
index 0c3d4b3..3bc1562 100644
--- a/core/java/android/hardware/location/ContextHubManager.java
+++ b/core/java/android/hardware/location/ContextHubManager.java
@@ -308,6 +308,7 @@
* @deprecated Use {@link #unregisterCallback(Callback)} instead.
* @hide
*/
+ @Deprecated
public synchronized int unregisterCallback(ICallback callback) {
if (callback != mLocalCallback) {
Log.w(TAG, "Cannot recognize local callback!");
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 4799773..34742d6 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -761,6 +761,7 @@
* @deprecated Starting in API 21, hardware acceleration is always enabled
* on capable devices.
*/
+ @Deprecated
public boolean enableHardwareAcceleration() {
if (mWindow != null) {
throw new IllegalStateException("Must be called before onCreate()");
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 1392121..d1b79e5 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -435,6 +435,7 @@
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} to request a network that
* provides the {@link NetworkCapabilities#NET_CAPABILITY_MMS} capability.
*/
+ @Deprecated
public static final int TYPE_MOBILE_MMS = 2;
/**
* A SUPL-specific Mobile data connection. This network type may use the
@@ -446,6 +447,7 @@
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} to request a network that
* provides the {@link NetworkCapabilities#NET_CAPABILITY_SUPL} capability.
*/
+ @Deprecated
public static final int TYPE_MOBILE_SUPL = 3;
/**
* A DUN-specific Mobile data connection. This network type may use the
@@ -463,6 +465,7 @@
* {@link #requestNetwork(NetworkRequest, NetworkCallback)} to request a network that
* uses the {@link NetworkCapabilities#TRANSPORT_CELLULAR} transport.
*/
+ @Deprecated
public static final int TYPE_MOBILE_HIPRI = 5;
/**
* The WiMAX data connection. When active, all data traffic
@@ -593,6 +596,7 @@
* @deprecated All APIs accepting a network type are deprecated. There should be no need to
* validate a network type.
*/
+ @Deprecated
public static boolean isNetworkTypeValid(int networkType) {
return networkType >= 0 && networkType <= MAX_NETWORK_TYPE;
}
@@ -700,6 +704,7 @@
* preference. Instead we use dynamic network properties of
* the networks to describe their precedence.
*/
+ @Deprecated
public void setNetworkPreference(int preference) {
}
@@ -715,6 +720,7 @@
* preference. Instead we use dynamic network properties of
* the networks to describe their precedence.
*/
+ @Deprecated
public int getNetworkPreference() {
return TYPE_NONE;
}
@@ -871,6 +877,7 @@
* of the same type. Use {@link #getAllNetworks} and
* {@link #getNetworkInfo(android.net.Network)} instead.
*/
+ @Deprecated
public NetworkInfo getNetworkInfo(int networkType) {
try {
return mService.getNetworkInfo(networkType);
@@ -917,6 +924,7 @@
* of the same type. Use {@link #getAllNetworks} and
* {@link #getNetworkInfo(android.net.Network)} instead.
*/
+ @Deprecated
public NetworkInfo[] getAllNetworkInfo() {
try {
return mService.getAllNetworkInfo();
@@ -937,6 +945,7 @@
* of the same type. Use {@link #getAllNetworks} and
* {@link #getNetworkInfo(android.net.Network)} instead.
*/
+ @Deprecated
public Network getNetworkForType(int networkType) {
try {
return mService.getNetworkForType(networkType);
@@ -1009,6 +1018,7 @@
* {@link #getNetworkInfo(android.net.Network)}, and
* {@link #getLinkProperties(android.net.Network)} instead.
*/
+ @Deprecated
public LinkProperties getLinkProperties(int networkType) {
try {
return mService.getLinkPropertiesForType(networkType);
@@ -1091,6 +1101,7 @@
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called.
*/
+ @Deprecated
public int startUsingNetworkFeature(int networkType, String feature) {
checkLegacyRoutingApiAccess();
NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -1146,6 +1157,7 @@
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called.
*/
+ @Deprecated
public int stopUsingNetworkFeature(int networkType, String feature) {
checkLegacyRoutingApiAccess();
NetworkCapabilities netCap = networkCapabilitiesForFeature(networkType, feature);
@@ -1559,6 +1571,7 @@
* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
* throw {@code UnsupportedOperationException} if called.
*/
+ @Deprecated
public boolean requestRouteToHost(int networkType, int hostAddress) {
return requestRouteToHostAddress(networkType, NetworkUtils.intToInetAddress(hostAddress));
}
@@ -1581,6 +1594,7 @@
* @deprecated Deprecated in favor of the {@link #requestNetwork} and
* {@link #bindProcessToNetwork} API.
*/
+ @Deprecated
public boolean requestRouteToHostAddress(int networkType, InetAddress hostAddress) {
checkLegacyRoutingApiAccess();
try {
@@ -1650,6 +1664,7 @@
* @hide
* @deprecated Talk to TelephonyManager directly
*/
+ @Deprecated
public boolean getMobileDataEnabled() {
IBinder b = ServiceManager.getService(Context.TELEPHONY_SERVICE);
if (b != null) {
@@ -1803,6 +1818,7 @@
* situations where a Context pointer is unavailable.
* @hide
*/
+ @Deprecated
static ConnectivityManager getInstanceOrNull() {
return sInstance;
}
@@ -1812,6 +1828,7 @@
* situations where a Context pointer is unavailable.
* @hide
*/
+ @Deprecated
private static ConnectivityManager getInstance() {
if (getInstanceOrNull() == null) {
throw new IllegalStateException("No ConnectivityManager yet constructed");
@@ -2219,6 +2236,7 @@
* @deprecated Use {@link #reportNetworkConnectivity} which allows reporting both
* working and non-working connectivity.
*/
+ @Deprecated
public void reportBadNetwork(Network network) {
try {
// One of these will be ignored because it matches system's current state.
@@ -2421,6 +2439,7 @@
* {@hide}
* @deprecated Doesn't properly deal with multiple connected networks of the same type.
*/
+ @Deprecated
public void setProvisioningNotificationVisible(boolean visible, int networkType,
String action) {
try {
@@ -3211,6 +3230,7 @@
* {@link #bindProcessToNetwork} instead. {@code bindProcessToNetwork}
* is a direct replacement.
*/
+ @Deprecated
public static boolean setProcessDefaultNetwork(Network network) {
int netId = (network == null) ? NETID_UNSET : network.netId;
if (netId == NetworkUtils.getBoundNetworkForProcess()) {
@@ -3257,6 +3277,7 @@
* {@link IllegalStateException}. Use {@link #getBoundNetworkForProcess} instead.
* {@code getBoundNetworkForProcess} is a direct replacement.
*/
+ @Deprecated
public static Network getProcessDefaultNetwork() {
int netId = NetworkUtils.getBoundNetworkForProcess();
if (netId == NETID_UNSET) return null;
@@ -3301,6 +3322,7 @@
* @hide
* @deprecated This is strictly for legacy usage to support {@link #startUsingNetworkFeature}.
*/
+ @Deprecated
public static boolean setProcessDefaultNetworkForHostResolution(Network network) {
return NetworkUtils.bindProcessToNetworkForHostResolution(
network == null ? NETID_UNSET : network.netId);
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 141af3d..069d227 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -74,6 +74,7 @@
*
* @deprecated This is strictly for legacy usage to support startUsingNetworkFeature().
*/
+ @Deprecated
public native static boolean bindProcessToNetworkForHostResolution(int netId);
/**
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java
index 7172c09..e3551b0 100644
--- a/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@ -57,6 +57,7 @@
* {@link ConnectivityManager#getLinkProperties(Network)}.{@link LinkProperties#getHttpProxy()}
* to get the proxy for the Network(s) they are using.
*/
+ @Deprecated
public static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
/** @hide */
@@ -130,6 +131,7 @@
* @deprecated Use standard java vm proxy values to find the host, port
* and exclusion list. This call ignores the exclusion list.
*/
+ @Deprecated
public static final String getHost(Context ctx) {
java.net.Proxy proxy = getProxy(ctx, null);
if (proxy == java.net.Proxy.NO_PROXY) return null;
@@ -147,6 +149,7 @@
* @deprecated Use standard java vm proxy values to find the host, port
* and exclusion list. This call ignores the exclusion list.
*/
+ @Deprecated
public static final int getPort(Context ctx) {
java.net.Proxy proxy = getProxy(ctx, null);
if (proxy == java.net.Proxy.NO_PROXY) return -1;
@@ -165,6 +168,7 @@
* exclusion list. This call ignores the exclusion list and no
* longer reports only mobile-data apn-based proxy values.
*/
+ @Deprecated
public static final String getDefaultHost() {
String host = System.getProperty("http.proxyHost");
if (TextUtils.isEmpty(host)) return null;
@@ -179,6 +183,7 @@
* exclusion list. This call ignores the exclusion list and no
* longer reports only mobile-data apn-based proxy values.
*/
+ @Deprecated
public static final int getDefaultPort() {
if (getDefaultHost() == null) return -1;
try {
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index b3f4453..b04d149 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -62,6 +62,7 @@
* @deprecated Consider using either {@link UserHandle#USER_SYSTEM} constant or
* check the target user's flag {@link android.content.pm.UserInfo#isAdmin}.
*/
+ @Deprecated
public static final @UserIdInt int USER_OWNER = 0;
/**
@@ -69,6 +70,7 @@
* @deprecated Consider using either {@link UserHandle#SYSTEM} constant or
* check the target user's flag {@link android.content.pm.UserInfo#isAdmin}.
*/
+ @Deprecated
public static final UserHandle OWNER = new UserHandle(USER_OWNER);
/** @hide A user id constant to indicate the "system" user of the device */
@@ -308,6 +310,7 @@
* {@link android.content.pm.UserInfo#isPrimary()}
* {@link android.content.pm.UserInfo#isAdmin()} based on your particular use case.
*/
+ @Deprecated
@SystemApi
public boolean isOwner() {
return this.equals(OWNER);
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 2613994..5e6b833 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -2089,6 +2089,7 @@
* @deprecated The restrictions PIN functionality is no longer provided by the system.
* This method is preserved for backwards compatibility reasons and always returns false.
*/
+ @Deprecated
public boolean setRestrictionsChallenge(String newPin) {
return false;
}
diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java
index 3aa526d..d409030 100644
--- a/core/java/android/provider/Contacts.java
+++ b/core/java/android/provider/Contacts.java
@@ -343,6 +343,7 @@
* no public constructor since this is a utility class
* @deprecated see {@link android.provider.ContactsContract}
*/
+ @Deprecated
private People() {}
/**
@@ -718,6 +719,7 @@
* no public constructor since this is a utility class
* @deprecated see {@link android.provider.ContactsContract}
*/
+ @Deprecated
private Extensions() {}
/**
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 237bc28..95add49 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2292,6 +2292,7 @@
* @hide
* @deprecated - Do not use
*/
+ @Deprecated
public static boolean getShowGTalkServiceStatusForUser(ContentResolver cr,
int userHandle) {
return getIntForUser(cr, SHOW_GTALK_SERVICE_STATUS, 0, userHandle) != 0;
@@ -4847,6 +4848,7 @@
* @hide
* @deprecated
*/
+ @Deprecated
public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info";
/**
@@ -4878,6 +4880,7 @@
* @hide
* @deprecated
*/
+ @Deprecated
public static final String LOCK_SCREEN_OWNER_INFO_ENABLED =
"lock_screen_owner_info_enabled";
diff --git a/core/java/android/provider/SyncConstValue.java b/core/java/android/provider/SyncConstValue.java
index 027aed1..58e42ce 100644
--- a/core/java/android/provider/SyncConstValue.java
+++ b/core/java/android/provider/SyncConstValue.java
@@ -21,6 +21,7 @@
* @deprecated Do not use.
* @hide
*/
+@Deprecated
public interface SyncConstValue
{
/**
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index 1557a27..b13e162 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -368,6 +368,7 @@
* cancel the notification. It will continue to cancel the notification for applications
* whose {@code targetSdkVersion} is earlier than {@link android.os.Build.VERSION_CODES#LOLLIPOP}.
*/
+ @Deprecated
public final void cancelNotification(String pkg, String tag, int id) {
if (!isBound()) return;
try {
diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java
index 2913128..be0b47c 100644
--- a/core/java/android/service/notification/StatusBarNotification.java
+++ b/core/java/android/service/notification/StatusBarNotification.java
@@ -249,6 +249,7 @@
*
* @deprecated Use {@link #getUser()} instead.
*/
+ @Deprecated
public int getUserId() {
return this.user.getIdentifier();
}
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index e354ab3..e9bbc2d 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -453,6 +453,7 @@
* VoiceInteractor.ConfirmationRequest}.
* @deprecated Prefer {@link #getVoicePrompt()} which allows multiple voice prompts.
*/
+ @Deprecated
@Nullable
public CharSequence getPrompt() {
return (mPrompt != null ? mPrompt.getVoicePromptAt(0) : null);
@@ -512,6 +513,7 @@
* {@link android.app.VoiceInteractor.PickOptionRequest VoiceInteractor.PickOptionRequest}.
* @deprecated Prefer {@link #getVoicePrompt()} which allows multiple voice prompts.
*/
+ @Deprecated
@Nullable
public CharSequence getPrompt() {
return (mPrompt != null ? mPrompt.getVoicePromptAt(0) : null);
@@ -622,6 +624,7 @@
* VoiceInteractor.CompleteVoiceRequest}.
* @deprecated Prefer {@link #getVoicePrompt()} which allows a separate visual message.
*/
+ @Deprecated
@Nullable
public CharSequence getMessage() {
return (mPrompt != null ? mPrompt.getVoicePromptAt(0) : null);
@@ -678,6 +681,7 @@
* {@link android.app.VoiceInteractor.AbortVoiceRequest VoiceInteractor.AbortVoiceRequest}.
* @deprecated Prefer {@link #getVoicePrompt()} which allows a separate visual message.
*/
+ @Deprecated
@Nullable
public CharSequence getMessage() {
return (mPrompt != null ? mPrompt.getVoicePromptAt(0) : null);
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
index 14ebec7..cb8852c 100644
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -116,9 +116,11 @@
public static final String ABBREV_WEEKDAY_FORMAT = "%a";
/** @deprecated Do not use. */
+ @Deprecated
public static final int[] sameYearTable = null;
/** @deprecated Do not use. */
+ @Deprecated
public static final int[] sameMonthTable = null;
/**
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index 6d1d893..d352a6d 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -225,6 +225,7 @@
* @deprecated Use {@link android.transition.ChangeTransform} to handle
* transitions between different parents.
*/
+ @Deprecated
public void setReparent(boolean reparent) {
mReparent = reparent;
}
diff --git a/core/java/android/view/ActionProvider.java b/core/java/android/view/ActionProvider.java
index 752240f..353b4c2 100644
--- a/core/java/android/view/ActionProvider.java
+++ b/core/java/android/view/ActionProvider.java
@@ -80,6 +80,7 @@
*
* @deprecated use {@link #onCreateActionView(MenuItem)}
*/
+ @Deprecated
public abstract View onCreateActionView();
/**
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index c568244..e45d492 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -2885,11 +2885,13 @@
/**
* @deprecated Use {@link #SYSTEM_UI_FLAG_LOW_PROFILE} instead.
*/
+ @Deprecated
public static final int STATUS_BAR_HIDDEN = SYSTEM_UI_FLAG_LOW_PROFILE;
/**
* @deprecated Use {@link #SYSTEM_UI_FLAG_VISIBLE} instead.
*/
+ @Deprecated
public static final int STATUS_BAR_VISIBLE = SYSTEM_UI_FLAG_VISIBLE;
/**
@@ -7666,6 +7668,7 @@
* {@link #setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener)}
* to implement handling their own insets.
*/
+ @Deprecated
protected boolean fitSystemWindows(Rect insets) {
if ((mPrivateFlags3 & PFLAG3_APPLYING_INSETS) == 0) {
if (insets == null) {
@@ -7927,6 +7930,7 @@
* Ask that a new dispatch of {@link #fitSystemWindows(Rect)} be performed.
* @deprecated Use {@link #requestApplyInsets()} for newer platform versions.
*/
+ @Deprecated
public void requestFitSystemWindows() {
if (mParent != null) {
mParent.requestFitSystemWindows();
@@ -20477,6 +20481,7 @@
* @deprecated Use {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)
* startDragAndDrop()} for newer platform versions.
*/
+ @Deprecated
public final boolean startDrag(ClipData data, DragShadowBuilder shadowBuilder,
Object myLocalState, int flags) {
return startDragAndDrop(data, shadowBuilder, myLocalState, flags);
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 8278335..6f9768f 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -810,6 +810,7 @@
* @deprecated See {@link #dumpv2(View, ByteArrayOutputStream)} below.
* @hide
*/
+ @Deprecated
public static void dump(View root, boolean skipChildren, boolean includeProperties,
OutputStream clientStream) throws IOException {
BufferedWriter out = null;
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 8e7c45c..37f9b71 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -249,6 +249,7 @@
private static final int FLAG_PADDING_NOT_NULL = 0x20;
/** @deprecated - functionality removed */
+ @Deprecated
private static final int FLAG_ANIMATION_CACHE = 0x40;
// When set, this ViewGroup converts calls to invalidate(Rect) to invalidate() during a
@@ -295,9 +296,11 @@
private static final int FLAG_ADD_STATES_FROM_CHILDREN = 0x2000;
/** @deprecated functionality removed */
+ @Deprecated
private static final int FLAG_ALWAYS_DRAWN_WITH_CACHE = 0x4000;
/** @deprecated functionality removed */
+ @Deprecated
private static final int FLAG_CHILDREN_DRAWN_WITH_CACHE = 0x8000;
/**
@@ -5651,6 +5654,7 @@
* @deprecated As of {@link android.os.Build.VERSION_CODES#M}, this property is ignored.
* Caching behavior of children may be controlled through {@link View#setLayerType(int, Paint)}.
*/
+ @Deprecated
public boolean isAnimationCacheEnabled() {
return (mGroupFlags & FLAG_ANIMATION_CACHE) == FLAG_ANIMATION_CACHE;
}
@@ -5669,6 +5673,7 @@
* @deprecated As of {@link android.os.Build.VERSION_CODES#M}, this property is ignored.
* Caching behavior of children may be controlled through {@link View#setLayerType(int, Paint)}.
*/
+ @Deprecated
public void setAnimationCacheEnabled(boolean enabled) {
setBooleanFlag(FLAG_ANIMATION_CACHE, enabled);
}
@@ -5686,6 +5691,7 @@
* @deprecated As of {@link android.os.Build.VERSION_CODES#M}, this property is ignored.
* Child views may no longer have their caching behavior disabled by parents.
*/
+ @Deprecated
public boolean isAlwaysDrawnWithCacheEnabled() {
return (mGroupFlags & FLAG_ALWAYS_DRAWN_WITH_CACHE) == FLAG_ALWAYS_DRAWN_WITH_CACHE;
}
@@ -5710,6 +5716,7 @@
* @deprecated As of {@link android.os.Build.VERSION_CODES#M}, this property is ignored.
* Child views may no longer have their caching behavior disabled by parents.
*/
+ @Deprecated
public void setAlwaysDrawnWithCacheEnabled(boolean always) {
setBooleanFlag(FLAG_ALWAYS_DRAWN_WITH_CACHE, always);
}
@@ -5727,6 +5734,7 @@
* Child views may no longer be forced to cache their rendering state by their parents.
* Use {@link View#setLayerType(int, Paint)} on individual Views instead.
*/
+ @Deprecated
protected boolean isChildrenDrawnWithCacheEnabled() {
return (mGroupFlags & FLAG_CHILDREN_DRAWN_WITH_CACHE) == FLAG_CHILDREN_DRAWN_WITH_CACHE;
}
@@ -5748,6 +5756,7 @@
* Child views may no longer be forced to cache their rendering state by their parents.
* Use {@link View#setLayerType(int, Paint)} on individual Views instead.
*/
+ @Deprecated
protected void setChildrenDrawnWithCacheEnabled(boolean enabled) {
setBooleanFlag(FLAG_CHILDREN_DRAWN_WITH_CACHE, enabled);
}
diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java
index dc4db01..44309a7 100644
--- a/core/java/android/view/inputmethod/InputMethodSubtype.java
+++ b/core/java/android/view/inputmethod/InputMethodSubtype.java
@@ -237,6 +237,7 @@
* {@link InputMethodSubtype#InputMethodSubtype(int, int, String, String, String, boolean,
* boolean, int)} except "id".
*/
+ @Deprecated
public InputMethodSubtype(int nameId, int iconId, String locale, String mode, String extraValue,
boolean isAuxiliary, boolean overridesImplicitlyEnabledSubtype) {
this(nameId, iconId, locale, mode, extraValue, isAuxiliary,
@@ -274,6 +275,7 @@
* Arrays.hashCode(new Object[] {locale, mode, extraValue,
* isAuxiliary, overridesImplicitlyEnabledSubtype, isAsciiCapable}) will be used instead.
*/
+ @Deprecated
public InputMethodSubtype(int nameId, int iconId, String locale, String mode, String extraValue,
boolean isAuxiliary, boolean overridesImplicitlyEnabledSubtype, int id) {
this(getBuilder(nameId, iconId, locale, mode, extraValue, isAuxiliary,
diff --git a/core/java/android/view/textservice/SpellCheckerSubtype.java b/core/java/android/view/textservice/SpellCheckerSubtype.java
index 35d3bf9..8dff0c6 100644
--- a/core/java/android/view/textservice/SpellCheckerSubtype.java
+++ b/core/java/android/view/textservice/SpellCheckerSubtype.java
@@ -100,6 +100,7 @@
* {@link SpellCheckerSubtype} objects right now. Hence only the system is expected to be able
* to instantiate {@link SpellCheckerSubtype} object.
*/
+ @Deprecated
public SpellCheckerSubtype(int nameId, String locale, String extraValue) {
this(nameId, locale, SUBTYPE_LANGUAGE_TAG_NONE, extraValue, SUBTYPE_ID_NONE);
}
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index 6d5fac1..3ec235b 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -158,6 +158,7 @@
* date.
* @deprecated use {@link #removeSessionCookies(ValueCallback)} instead.
*/
+ @Deprecated
public abstract void removeSessionCookie();
/**
diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java
index 2d3b6ab..70a49fb 100644
--- a/core/java/android/webkit/WebChromeClient.java
+++ b/core/java/android/webkit/WebChromeClient.java
@@ -344,6 +344,7 @@
// the default JS engine with Froyo and support for building with JSC was
// removed in b/5495373. V8 does not have a mechanism for making a callback such
// as this.
+ @Deprecated
public boolean onJsTimeout() {
return true;
}
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 5c47397..636fa7d 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -81,6 +81,7 @@
*
* @deprecated Use {@link WebSettings#setTextZoom(int)} and {@link WebSettings#getTextZoom()} instead.
*/
+ @Deprecated
public enum TextSize {
SMALLEST(50),
SMALLER(75),
@@ -476,6 +477,7 @@
* @param t the text size as a {@link TextSize} value
* @deprecated Use {@link #setTextZoom} instead.
*/
+ @Deprecated
public synchronized void setTextSize(TextSize t) {
setTextZoom(t.value);
}
@@ -489,6 +491,7 @@
* @see #setTextSize
* @deprecated Use {@link #getTextZoom} instead.
*/
+ @Deprecated
public synchronized TextSize getTextSize() {
TextSize closestSize = null;
int smallestDelta = Integer.MAX_VALUE;
@@ -533,6 +536,7 @@
* @see #setDefaultZoom
* @deprecated Will only return the default value.
*/
+ @Deprecated
public abstract ZoomDensity getDefaultZoom();
/**
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index f54edf1..cbfe43a 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -688,6 +688,7 @@
* @deprecated This method is now obsolete.
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
+ @Deprecated
public int getVisibleTitleHeight() {
checkThread();
return mProvider.getVisibleTitleHeight();
diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java
index a585d75..278ceb2 100644
--- a/core/java/android/widget/TextClock.java
+++ b/core/java/android/widget/TextClock.java
@@ -102,6 +102,7 @@
*
* @deprecated Let the system use locale-appropriate defaults instead.
*/
+ @Deprecated
public static final CharSequence DEFAULT_FORMAT_12_HOUR = "h:mm a";
/**
@@ -116,6 +117,7 @@
*
* @deprecated Let the system use locale-appropriate defaults instead.
*/
+ @Deprecated
public static final CharSequence DEFAULT_FORMAT_24_HOUR = "H:mm";
private CharSequence mFormat12;