Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a9f554 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev 

am: c2e09129

Change-Id: I26089a2aef16845f2e2935e95810457e287bd0e1
parents 6099e1c1 c2e09129

api/system-current.txt

+0 −106
Original line number Diff line number Diff line
@@ -4724,14 +4724,6 @@ package android.app { 
    field public static final int VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION = 3; // 0x3

  }













  public abstract deprecated class EphemeralResolverService extends android.app.InstantAppResolverService {













    ctor public EphemeralResolverService();













    method public android.os.Looper getLooper();













    method public abstract deprecated java.util.List<android.content.pm.EphemeralResolveInfo> onEphemeralResolveInfoList(int[], int);













    method public android.content.pm.EphemeralResolveInfo onGetEphemeralIntentFilter(java.lang.String);













    method public java.util.List<android.content.pm.EphemeralResolveInfo> onGetEphemeralResolveInfo(int[]);













  }



























  public class ExpandableListActivity extends android.app.Activity implements android.widget.ExpandableListView.OnChildClickListener android.widget.ExpandableListView.OnGroupCollapseListener android.widget.ExpandableListView.OnGroupExpandListener android.view.View.OnCreateContextMenuListener {















    ctor public ExpandableListActivity();















    method public android.widget.ExpandableListAdapter getExpandableListAdapter();










@@ -9882,7 +9874,6 @@ package android.content {













    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";















    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";















    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";













    field public static final deprecated java.lang.String ACTION_DEVICE_INITIALIZATION_WIZARD = "android.intent.action.DEVICE_INITIALIZATION_WIZARD";















    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";















    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";















    field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL";









@@ -9890,7 +9881,6 @@ package android.content {













    field public static final java.lang.String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED";















    field public static final java.lang.String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED";















    field public static final java.lang.String ACTION_EDIT = "android.intent.action.EDIT";













    field public static final deprecated java.lang.String ACTION_EPHEMERAL_RESOLVER_SETTINGS = "android.intent.action.EPHEMERAL_RESOLVER_SETTINGS";















    field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE";















    field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE";















    field public static final java.lang.String ACTION_FACTORY_RESET = "android.intent.action.FACTORY_RESET";









@@ -9904,7 +9894,6 @@ package android.content {













    field public static final java.lang.String ACTION_INPUT_METHOD_CHANGED = "android.intent.action.INPUT_METHOD_CHANGED";















    field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";















    field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";













    field public static final deprecated java.lang.String ACTION_INSTALL_EPHEMERAL_PACKAGE = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE";















    field public static final java.lang.String ACTION_INSTALL_FAILURE = "android.intent.action.INSTALL_FAILURE";















    field public static final java.lang.String ACTION_INSTALL_INSTANT_APP_PACKAGE = "android.intent.action.INSTALL_INSTANT_APP_PACKAGE";















    field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";









@@ -9923,7 +9912,6 @@ package android.content {













    field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";















    field public static final java.lang.String ACTION_MANAGE_PERMISSIONS = "android.intent.action.MANAGE_PERMISSIONS";















    field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS";













    field public static final deprecated java.lang.String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";















    field public static final java.lang.String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION";















    field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";















    field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";










@@ -9968,7 +9956,6 @@ package android.content {













    field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";















    field public static final java.lang.String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";















    field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";













    field public static final deprecated java.lang.String ACTION_RESOLVE_EPHEMERAL_PACKAGE = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE";















    field public static final java.lang.String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE";















    field public static final java.lang.String ACTION_REVIEW_PERMISSIONS = "android.intent.action.REVIEW_PERMISSIONS";















    field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";









@@ -9979,7 +9966,6 @@ package android.content {













    field public static final java.lang.String ACTION_SEND = "android.intent.action.SEND";















    field public static final java.lang.String ACTION_SENDTO = "android.intent.action.SENDTO";















    field public static final java.lang.String ACTION_SEND_MULTIPLE = "android.intent.action.SEND_MULTIPLE";













    field public static final deprecated java.lang.String ACTION_SERVICE_STATE = "android.intent.action.SERVICE_STATE";















    field public static final java.lang.String ACTION_SET_WALLPAPER = "android.intent.action.SET_WALLPAPER";















    field public static final java.lang.String ACTION_SHOW_APP_INFO = "android.intent.action.SHOW_APP_INFO";















    field public static final java.lang.String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN";










@@ -10055,8 +10041,6 @@ package android.content {













    field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";















    field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";















    field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";













    field public static final deprecated java.lang.String EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR = "cdmaDefaultRoamingIndicator";













    field public static final deprecated java.lang.String EXTRA_CDMA_ROAMING_INDICATOR = "cdmaRoamingIndicator";















    field public static final deprecated java.lang.String EXTRA_CHANGED_COMPONENT_NAME = "android.intent.extra.changed_component_name";















    field public static final java.lang.String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_list";















    field public static final java.lang.String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";









@@ -10067,14 +10051,7 @@ package android.content {













    field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";















    field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";















    field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";













    field public static final deprecated java.lang.String EXTRA_CSS_INDICATOR = "cssIndicator";













    field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_ALPHA_LONG = "data-operator-alpha-long";













    field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_ALPHA_SHORT = "data-operator-alpha-short";













    field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_NUMERIC = "data-operator-numeric";













    field public static final deprecated java.lang.String EXTRA_DATA_RADIO_TECH = "dataRadioTechnology";













    field public static final deprecated java.lang.String EXTRA_DATA_REG_STATE = "dataRegState";















    field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";













    field public static final deprecated java.lang.String EXTRA_DATA_ROAMING_TYPE = "dataRoamingType";















    field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";















    field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2















    field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1









@@ -10083,7 +10060,6 @@ package android.content {













    field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0















    field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";















    field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";













    field public static final deprecated java.lang.String EXTRA_EMERGENCY_ONLY = "emergencyOnly";















    field public static final java.lang.String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";















    field public static final java.lang.String EXTRA_FORCE_FACTORY_RESET = "android.intent.extra.FORCE_FACTORY_RESET";















    field public static final java.lang.String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";









@@ -10092,18 +10068,10 @@ package android.content {













    field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";















    field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";















    field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";













    field public static final deprecated java.lang.String EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION = "isDataRoamingFromRegistration";













    field public static final deprecated java.lang.String EXTRA_IS_USING_CARRIER_AGGREGATION = "isUsingCarrierAggregation";















    field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";















    field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";













    field public static final deprecated java.lang.String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";













    field public static final deprecated java.lang.String EXTRA_MANUAL = "manual";















    field public static final java.lang.String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";













    field public static final deprecated java.lang.String EXTRA_NETWORK_ID = "networkId";















    field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";













    field public static final deprecated java.lang.String EXTRA_OPERATOR_ALPHA_LONG = "operator-alpha-long";













    field public static final deprecated java.lang.String EXTRA_OPERATOR_ALPHA_SHORT = "operator-alpha-short";













    field public static final deprecated java.lang.String EXTRA_OPERATOR_NUMERIC = "operator-numeric";















    field public static final java.lang.String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID";















    field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";















    field public static final java.lang.String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";










@@ -10134,15 +10102,11 @@ package android.content {













    field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";















    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";















    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";













    field public static final deprecated java.lang.String EXTRA_SYSTEM_ID = "systemId";















    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";















    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";















    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";















    field public static final java.lang.String EXTRA_UID = "android.intent.extra.UID";















    field public static final java.lang.String EXTRA_USER = "android.intent.extra.USER";













    field public static final deprecated java.lang.String EXTRA_VOICE_RADIO_TECH = "radioTechnology";













    field public static final deprecated java.lang.String EXTRA_VOICE_REG_STATE = "voiceRegState";













    field public static final deprecated java.lang.String EXTRA_VOICE_ROAMING_TYPE = "voiceRoamingType";















    field public static final int FILL_IN_ACTION = 1; // 0x1















    field public static final int FILL_IN_CATEGORIES = 4; // 0x4















    field public static final int FILL_IN_CLIP_DATA = 128; // 0x80










@@ -10881,41 +10845,6 @@ package android.content.pm {













    field public int reqTouchScreen;















  }



























  public final deprecated class EphemeralIntentFilter implements android.os.Parcelable {













    ctor public EphemeralIntentFilter(java.lang.String, java.util.List<android.content.IntentFilter>);













    method public int describeContents();













    method public java.util.List<android.content.IntentFilter> getFilters();













    method public java.lang.String getSplitName();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.EphemeralIntentFilter> CREATOR;













  }

























  public final deprecated class EphemeralResolveInfo implements android.os.Parcelable {













    ctor public deprecated EphemeralResolveInfo(android.net.Uri, java.lang.String, java.util.List<android.content.IntentFilter>);













    ctor public deprecated EphemeralResolveInfo(android.content.pm.EphemeralResolveInfo.EphemeralDigest, java.lang.String, java.util.List<android.content.pm.EphemeralIntentFilter>);













    ctor public EphemeralResolveInfo(android.content.pm.EphemeralResolveInfo.EphemeralDigest, java.lang.String, java.util.List<android.content.pm.EphemeralIntentFilter>, int);













    ctor public EphemeralResolveInfo(java.lang.String, java.lang.String, java.util.List<android.content.pm.EphemeralIntentFilter>);













    method public int describeContents();













    method public byte[] getDigestBytes();













    method public int getDigestPrefix();













    method public deprecated java.util.List<android.content.IntentFilter> getFilters();













    method public java.util.List<android.content.pm.EphemeralIntentFilter> getIntentFilters();













    method public java.lang.String getPackageName();













    method public int getVersionCode();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.EphemeralResolveInfo> CREATOR;













    field public static final java.lang.String SHA_ALGORITHM = "SHA-256";













  }

























  public static final class EphemeralResolveInfo.EphemeralDigest implements android.os.Parcelable {













    ctor public EphemeralResolveInfo.EphemeralDigest(java.lang.String);













    method public int describeContents();













    method public byte[][] getDigestBytes();













    method public int[] getDigestPrefix();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.EphemeralResolveInfo.EphemeralDigest> CREATOR;













  }



























  public final class FeatureGroupInfo implements android.os.Parcelable {















    ctor public FeatureGroupInfo();















    ctor public FeatureGroupInfo(android.content.pm.FeatureGroupInfo);










@@ -27116,10 +27045,6 @@ package android.media.tv {













    method public boolean canRecord();















    method public deprecated android.content.Intent createSettingsIntent();















    method public android.content.Intent createSetupIntent();













    method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.hardware.hdmi.HdmiDeviceInfo, java.lang.String, java.lang.String, android.net.Uri) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.hardware.hdmi.HdmiDeviceInfo, java.lang.String, int, android.graphics.drawable.Icon) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.media.tv.TvInputHardwareInfo, java.lang.String, android.net.Uri) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method public static deprecated android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.media.tv.TvInputHardwareInfo, int, android.graphics.drawable.Icon) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;















    method public int describeContents();















    method public android.os.Bundle getExtras();















    method public android.hardware.hdmi.HdmiDeviceInfo getHdmiDeviceInfo();










@@ -28805,15 +28730,6 @@ package android.net.sip {



























package android.net.wifi {



























  public deprecated class BatchedScanResult implements android.os.Parcelable {













    ctor public BatchedScanResult();













    ctor public BatchedScanResult(android.net.wifi.BatchedScanResult);













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public final java.util.List<android.net.wifi.ScanResult> scanResults;













    field public boolean truncated;













  }



























  public class RttManager {















    method public void disableResponder(android.net.wifi.RttManager.ResponderCallback);















    method public void enableResponder(android.net.wifi.RttManager.ResponderCallback);










@@ -29032,7 +28948,6 @@ package android.net.wifi {













    field public int level;















    field public java.lang.CharSequence operatorFriendlyName;















    field public long timestamp;













    field public boolean untrusted;















    field public java.lang.CharSequence venueName;















  }
























@@ -29146,21 +29061,6 @@ package android.net.wifi {













    field public static final java.lang.String[] strings;















  }



























  public class WifiConnectionStatistics implements android.os.Parcelable {













    ctor public WifiConnectionStatistics();













    ctor public WifiConnectionStatistics(android.net.wifi.WifiConnectionStatistics);













    method public int describeContents();













    method public void incrementOrAddUntrusted(java.lang.String, int, int);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.wifi.WifiConnectionStatistics> CREATOR;













    field public int num24GhzConnected;













    field public int num5GhzConnected;













    field public int numAutoJoinAttempt;













    field public int numAutoRoamAttempt;













    field public int numWifiManagerJoinAttempt;













    field public java.util.HashMap<java.lang.String, android.net.wifi.WifiNetworkConnectionStatistics> untrustedNetworkHistory;













  }



























  public class WifiEnterpriseConfig implements android.os.Parcelable {















    ctor public WifiEnterpriseConfig();















    ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);










@@ -29251,10 +29151,8 @@ package android.net.wifi {













    method public boolean disableNetwork(int);















    method public boolean disconnect();















    method public boolean enableNetwork(int, boolean);













    method public deprecated java.util.List<android.net.wifi.BatchedScanResult> getBatchedScanResults();















    method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();















    method public android.net.wifi.WifiInfo getConnectionInfo();













    method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics();















    method public android.net.DhcpInfo getDhcpInfo();















    method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();















    method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();









@@ -29263,7 +29161,6 @@ package android.net.wifi {













    method public int getWifiApState();















    method public int getWifiState();















    method public boolean is5GHzBandSupported();













    method public deprecated boolean isBatchedScanSupported();















    method public boolean isDeviceToApRttSupported();















    method public boolean isDeviceToDeviceRttSupported();















    method public boolean isEnhancedPowerReportingSupported();









@@ -29286,7 +29183,6 @@ package android.net.wifi {













    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);















    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);















    method public boolean startScan();















    method public boolean startScan(android.os.WorkSource);















    method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);










@@ -34233,7 +34129,6 @@ package android.os {













    method public boolean isIgnoringBatteryOptimizations(java.lang.String);















    method public boolean isInteractive();















    method public boolean isPowerSaveMode();













    method public deprecated boolean isScreenBrightnessBoosted();















    method public deprecated boolean isScreenOn();















    method public boolean isSustainedPerformanceModeSupported();















    method public boolean isWakeLockLevelSupported(int);









@@ -34243,7 +34138,6 @@ package android.os {













    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000















    field public static final java.lang.String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";















    field public static final java.lang.String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";













    field public static final deprecated java.lang.String ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED = "android.os.action.SCREEN_BRIGHTNESS_BOOST_CHANGED";















    field public static final deprecated int FULL_WAKE_LOCK = 26; // 0x1a















    field public static final int ON_AFTER_RELEASE = 536870912; // 0x20000000















    field public static final int PARTIAL_WAKE_LOCK = 1; // 0x1

























api/system-removed.txt



+94
−0




























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/EphemeralResolverService.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -40,6 +40,7 @@ import java.util.List;













/**















 * Base class for implementing the resolver service.















 * @hide













 * @removed















 * @deprecated use InstantAppResolverService instead















 */















@Deprecated

































core/java/android/content/Intent.java



+28
−0




























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/content/pm/EphemeralIntentFilter.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -29,6 +29,7 @@ import java.util.List;













/**















 * Information about an ephemeral application intent filter.















 * @hide













 * @removed















 */















@Deprecated















@SystemApi