Merge "Fix handling of @removed APIs." into oc-mr1-dev (5cb2d64b) · Commits · e / os / android_frameworks_base

api/removed.txt

+0 −62

Original line number	Diff line number	Diff line
		@@ -25,30 +25,9 @@ package android.app {
		method public deprecated android.app.Notification.Builder setTimeout(long);
		}

		public static final class Notification.TvExtender implements android.app.Notification.Extender {
		method public deprecated java.lang.String getChannel();
		}

		public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
		ctor public deprecated PictureInPictureArgs();
		ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>);
		method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
		method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
		method public void copyOnlySet(android.app.PictureInPictureArgs);
		method public java.util.List<android.app.RemoteAction> getActions();
		method public float getAspectRatio();
		method public android.util.Rational getAspectRatioRational();
		method public android.graphics.Rect getSourceRectHint();
		method public android.graphics.Rect getSourceRectHintInsets();
		method public boolean hasSetActions();
		method public boolean hasSetAspectRatio();
		method public boolean hasSourceBoundsHint();
		method public boolean hasSourceBoundsHintInsets();
		method public deprecated void setActions(java.util.List<android.app.RemoteAction>);
		method public deprecated void setAspectRatio(float);
		method public deprecated void setSourceRectHint(android.graphics.Rect);
		method public deprecated void setSourceRectHintInsets(android.graphics.Rect);
		method public void truncateActions(int);
		field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
		}

		@@ -60,10 +39,6 @@ package android.app {
		method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect);
		}

		public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {
		method public deprecated void showAsNotification(android.content.Context);
		}

		}

		package android.app.admin {
		@@ -71,8 +46,6 @@ package android.app.admin {
		public class DevicePolicyManager {
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getDeviceInitializerApp();
		method public deprecated android.content.ComponentName getDeviceInitializerComponent();
		}

		}
		@@ -267,24 +240,12 @@ package android.net {

		}

		package android.net.wifi {

		public class WifiManager {
		method public deprecated boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
		}

		}

		package android.os {

		public class BatteryManager {
		ctor public BatteryManager();
		}

		public class Build {
		field public static final boolean PERMISSIONS_REVIEW_REQUIRED;
		}

		public final class PowerManager {
		method public void goToSleep(long);
		method public deprecated void userActivity(long, boolean);
		@@ -355,11 +316,8 @@ package android.provider {
		field public static final java.lang.String CREATED = "created";
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String FAVICON = "favicon";
		field public static final java.lang.String THUMBNAIL = "thumbnail";
		field public static final java.lang.String TITLE = "title";
		field public static final java.lang.String TOUCH_ICON = "touch_icon";
		field public static final java.lang.String URL = "url";
		field public static final java.lang.String USER_ENTERED = "user_entered";
		field public static final java.lang.String VISITS = "visits";
		}

		@@ -450,26 +408,6 @@ package android.provider {

		}

		package android.service.notification {

		public abstract class NotificationListenerService extends android.app.Service {
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(int);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[], int);
		method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
		method public final void setOnNotificationPostedTrim(int);
		method public final void snoozeNotification(java.lang.String, java.lang.String);
		method public void unregisterAsSystemService() throws android.os.RemoteException;
		field public static final int TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

		public static class NotificationListenerService.Ranking {
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		}

		}

		package android.speech.tts {

		public abstract class UtteranceProgressListener {

api/system-current.txt

+0 −15

Original line number	Diff line number	Diff line
		@@ -5323,7 +5323,6 @@ package android.app {
		method public java.lang.String getGroup();
		method public int getGroupAlertBehavior();
		method public android.graphics.drawable.Icon getLargeIcon();
		method public static java.lang.Class<? extends android.app.Notification.Style> getNotificationStyleClass(java.lang.String);
		method public java.lang.CharSequence getSettingsText();
		method public java.lang.String getShortcutId();
		method public android.graphics.drawable.Icon getSmallIcon();
		@@ -6539,8 +6538,6 @@ package android.app.admin {
		method public int getCurrentFailedPasswordAttempts();
		method public java.util.List<java.lang.String> getDelegatePackages(android.content.ComponentName, java.lang.String);
		method public java.util.List<java.lang.String> getDelegatedScopes(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getDeviceInitializerApp();
		method public deprecated android.content.ComponentName getDeviceInitializerComponent();
		method public java.lang.String getDeviceOwner();
		method public android.content.ComponentName getDeviceOwnerComponentOnAnyUser();
		method public java.lang.CharSequence getDeviceOwnerLockScreenInfo();
		@@ -29285,7 +29282,6 @@ package android.net.wifi {
		method public void setTdlsEnabled(java.net.InetAddress, boolean);
		method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
		method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
		method public deprecated boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
		method public boolean setWifiEnabled(boolean);
		method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler);
		method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);
		@@ -33388,7 +33384,6 @@ package android.os {
		field public static final java.lang.String ID;
		field public static final java.lang.String MANUFACTURER;
		field public static final java.lang.String MODEL;
		field public static final boolean PERMISSIONS_REVIEW_REQUIRED;
		field public static final java.lang.String PRODUCT;
		field public static final deprecated java.lang.String RADIO;
		field public static final deprecated java.lang.String SERIAL;
		@@ -40627,9 +40622,7 @@ package android.service.notification {
		method public final void cancelNotification(java.lang.String);
		method public final void cancelNotifications(java.lang.String[]);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(int);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[]);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[], int);
		method public final int getCurrentInterruptionFilter();
		method public final int getCurrentListenerHints();
		method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();
		@@ -40649,16 +40642,12 @@ package android.service.notification {
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
		method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, int);
		method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
		method public final void requestInterruptionFilter(int);
		method public final void requestListenerHints(int);
		method public static void requestRebind(android.content.ComponentName);
		method public final void requestUnbind();
		method public final void setNotificationsShown(java.lang.String[]);
		method public final void setOnNotificationPostedTrim(int);
		method public final void snoozeNotification(java.lang.String, java.lang.String);
		method public final void snoozeNotification(java.lang.String, long);
		method public void unregisterAsSystemService() throws android.os.RemoteException;
		method public final void updateNotificationChannel(java.lang.String, android.os.UserHandle, android.app.NotificationChannel);
		field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4
		field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1
		@@ -40693,21 +40682,17 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
		field public static final int SUPPRESSED_EFFECT_SCREEN_OFF = 1; // 0x1
		field public static final int SUPPRESSED_EFFECT_SCREEN_ON = 2; // 0x2
		field public static final int TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

		public static class NotificationListenerService.Ranking {
		ctor public NotificationListenerService.Ranking();
		method public boolean canShowBadge();
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public android.app.NotificationChannel getChannel();
		method public int getImportance();
		method public java.lang.CharSequence getImportanceExplanation();
		method public java.lang.String getKey();
		method public java.lang.String getOverrideGroupKey();
		method public int getRank();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		method public int getSuppressedVisualEffects();
		method public boolean isAmbient();
		method public boolean matchesInterruptionFilter();

api/system-removed.txt

+35 −24

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ package android.app {

		public class Notification implements android.os.Parcelable {
		method public deprecated java.lang.String getChannel();
		method public static java.lang.Class<? extends android.app.Notification.Style> getNotificationStyleClass(java.lang.String);
		method public deprecated long getTimeout();
		method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
		}
		@@ -29,25 +30,8 @@ package android.app {
		}

		public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
		ctor public deprecated PictureInPictureArgs();
		ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>);
		method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
		method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
		method public void copyOnlySet(android.app.PictureInPictureArgs);
		method public java.util.List<android.app.RemoteAction> getActions();
		method public float getAspectRatio();
		method public android.util.Rational getAspectRatioRational();
		method public android.graphics.Rect getSourceRectHint();
		method public android.graphics.Rect getSourceRectHintInsets();
		method public boolean hasSetActions();
		method public boolean hasSetAspectRatio();
		method public boolean hasSourceBoundsHint();
		method public boolean hasSourceBoundsHintInsets();
		method public deprecated void setActions(java.util.List<android.app.RemoteAction>);
		method public deprecated void setAspectRatio(float);
		method public deprecated void setSourceRectHint(android.graphics.Rect);
		method public deprecated void setSourceRectHintInsets(android.graphics.Rect);
		method public void truncateActions(int);
		field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
		}

		@@ -59,10 +43,6 @@ package android.app {
		method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect);
		}

		public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {
		method public deprecated void showAsNotification(android.content.Context);
		}

		}

		package android.app.admin {
		@@ -70,6 +50,8 @@ package android.app.admin {
		public class DevicePolicyManager {
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getDeviceInitializerApp();
		method public deprecated android.content.ComponentName getDeviceInitializerComponent();
		}

		}
		@@ -264,12 +246,24 @@ package android.net {

		}

		package android.net.wifi {

		public class WifiManager {
		method public deprecated boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
		}

		}

		package android.os {

		public class BatteryManager {
		ctor public BatteryManager();
		}

		public class Build {
		field public static final boolean PERMISSIONS_REVIEW_REQUIRED;
		}

		public final class PowerManager {
		method public void goToSleep(long);
		method public deprecated void userActivity(long, boolean);
		@@ -340,11 +334,8 @@ package android.provider {
		field public static final java.lang.String CREATED = "created";
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String FAVICON = "favicon";
		field public static final java.lang.String THUMBNAIL = "thumbnail";
		field public static final java.lang.String TITLE = "title";
		field public static final java.lang.String TOUCH_ICON = "touch_icon";
		field public static final java.lang.String URL = "url";
		field public static final java.lang.String USER_ENTERED = "user_entered";
		field public static final java.lang.String VISITS = "visits";
		}

		@@ -435,6 +426,26 @@ package android.provider {

		}

		package android.service.notification {

		public abstract class NotificationListenerService extends android.app.Service {
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(int);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[], int);
		method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
		method public final void setOnNotificationPostedTrim(int);
		method public final void snoozeNotification(java.lang.String, java.lang.String);
		method public void unregisterAsSystemService() throws android.os.RemoteException;
		field public static final int TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

		public static class NotificationListenerService.Ranking {
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		}

		}

		package android.speech.tts {

		public abstract class UtteranceProgressListener {

api/test-removed.txt

+0 −62

Original line number	Diff line number	Diff line
		@@ -25,30 +25,9 @@ package android.app {
		method public deprecated android.app.Notification.Builder setTimeout(long);
		}

		public static final class Notification.TvExtender implements android.app.Notification.Extender {
		method public deprecated java.lang.String getChannel();
		}

		public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
		ctor public deprecated PictureInPictureArgs();
		ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>);
		method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
		method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
		method public void copyOnlySet(android.app.PictureInPictureArgs);
		method public java.util.List<android.app.RemoteAction> getActions();
		method public float getAspectRatio();
		method public android.util.Rational getAspectRatioRational();
		method public android.graphics.Rect getSourceRectHint();
		method public android.graphics.Rect getSourceRectHintInsets();
		method public boolean hasSetActions();
		method public boolean hasSetAspectRatio();
		method public boolean hasSourceBoundsHint();
		method public boolean hasSourceBoundsHintInsets();
		method public deprecated void setActions(java.util.List<android.app.RemoteAction>);
		method public deprecated void setAspectRatio(float);
		method public deprecated void setSourceRectHint(android.graphics.Rect);
		method public deprecated void setSourceRectHintInsets(android.graphics.Rect);
		method public void truncateActions(int);
		field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
		}

		@@ -60,10 +39,6 @@ package android.app {
		method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect);
		}

		public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {
		method public deprecated void showAsNotification(android.content.Context);
		}

		}

		package android.app.admin {
		@@ -71,8 +46,6 @@ package android.app.admin {
		public class DevicePolicyManager {
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getDeviceInitializerApp();
		method public deprecated android.content.ComponentName getDeviceInitializerComponent();
		}

		}
		@@ -267,24 +240,12 @@ package android.net {

		}

		package android.net.wifi {

		public class WifiManager {
		method public deprecated boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
		}

		}

		package android.os {

		public class BatteryManager {
		ctor public BatteryManager();
		}

		public class Build {
		field public static final boolean PERMISSIONS_REVIEW_REQUIRED;
		}

		public final class PowerManager {
		method public void goToSleep(long);
		method public deprecated void userActivity(long, boolean);
		@@ -355,11 +316,8 @@ package android.provider {
		field public static final java.lang.String CREATED = "created";
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String FAVICON = "favicon";
		field public static final java.lang.String THUMBNAIL = "thumbnail";
		field public static final java.lang.String TITLE = "title";
		field public static final java.lang.String TOUCH_ICON = "touch_icon";
		field public static final java.lang.String URL = "url";
		field public static final java.lang.String USER_ENTERED = "user_entered";
		field public static final java.lang.String VISITS = "visits";
		}

		@@ -450,26 +408,6 @@ package android.provider {

		}

		package android.service.notification {

		public abstract class NotificationListenerService extends android.app.Service {
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(int);
		method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[], int);
		method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
		method public final void setOnNotificationPostedTrim(int);
		method public final void snoozeNotification(java.lang.String, java.lang.String);
		method public void unregisterAsSystemService() throws android.os.RemoteException;
		field public static final int TRIM_FULL = 0; // 0x0
		field public static final int TRIM_LIGHT = 1; // 0x1
		}

		public static class NotificationListenerService.Ranking {
		method public java.util.List<java.lang.String> getAdditionalPeople();
		method public java.util.List<android.service.notification.SnoozeCriterion> getSnoozeCriteria();
		}

		}

		package android.speech.tts {

		public abstract class UtteranceProgressListener {

core/java/android/content/pm/PackageManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -3795,7 +3795,6 @@ public abstract class PackageManager {

		/**
		* @removed
		* @hide
		*/
		public abstract boolean setInstantAppCookie(@Nullable byte[] cookie);