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

Commit cbb04c86 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508c 

am: b129fade

Change-Id: I9b8414b89138651f3b3132789cae59ad6780dbb6
parents 0763ed26 b129fade

api/current.txt

+1 −13
Original line number Diff line number Diff line
@@ -7212,7 +7212,6 @@ package android.app.slice { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.slice.Slice> CREATOR;

    field public static final java.lang.String EXTRA_RANGE_VALUE = "android.app.slice.extra.RANGE_VALUE";

    field public static final deprecated java.lang.String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";

    field public static final java.lang.String EXTRA_TOGGLE_STATE = "android.app.slice.extra.TOGGLE_STATE";

    field public static final java.lang.String HINT_ACTIONS = "actions";

    field public static final java.lang.String HINT_ERROR = "error";
@@ -7239,14 +7238,12 @@ package android.app.slice { 
    field public static final java.lang.String SUBTYPE_MILLIS = "millis";

    field public static final java.lang.String SUBTYPE_PRIORITY = "priority";

    field public static final java.lang.String SUBTYPE_RANGE = "range";

    field public static final deprecated java.lang.String SUBTYPE_SLIDER = "slider";

    field public static final java.lang.String SUBTYPE_SOURCE = "source";

    field public static final java.lang.String SUBTYPE_TOGGLE = "toggle";

    field public static final java.lang.String SUBTYPE_VALUE = "value";

  }















  public static class Slice.Builder {













    ctor public deprecated Slice.Builder(android.net.Uri);















    ctor public Slice.Builder(android.net.Uri, android.app.slice.SliceSpec);















    ctor public Slice.Builder(android.app.slice.Slice.Builder);















    method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);









@@ -7258,10 +7255,8 @@ package android.app.slice {













    method public android.app.slice.Slice.Builder addRemoteInput(android.app.RemoteInput, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice.Builder addSubSlice(android.app.slice.Slice, java.lang.String);















    method public android.app.slice.Slice.Builder addText(java.lang.CharSequence, java.lang.String, java.util.List<java.lang.String>);













    method public deprecated android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);















    method public android.app.slice.Slice build();















    method public android.app.slice.Slice.Builder setCallerNeeded(boolean);













    method public deprecated android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);















  }





























  public final class SliceItem implements android.os.Parcelable {









@@ -7272,11 +7267,11 @@ package android.app.slice {













    method public java.util.List<java.lang.String> getHints();















    method public android.graphics.drawable.Icon getIcon();















    method public int getInt();













    method public long getLong();















    method public android.app.RemoteInput getRemoteInput();















    method public android.app.slice.Slice getSlice();















    method public java.lang.String getSubType();















    method public java.lang.CharSequence getText();













    method public long getTimestamp();















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















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















    field public static final android.os.Parcelable.Creator<android.app.slice.SliceItem> CREATOR;









@@ -7288,14 +7283,11 @@ package android.app.slice {













    field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";















    field public static final java.lang.String FORMAT_SLICE = "slice";















    field public static final java.lang.String FORMAT_TEXT = "text";













    field public static final deprecated java.lang.String FORMAT_TIMESTAMP = "long";















  }





























  public class SliceManager {















    method public android.app.slice.Slice bindSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice bindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);















    method public android.app.slice.Slice bindSlice(android.content.Intent, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice bindSlice(android.content.Intent, java.util.List<android.app.slice.SliceSpec>);















    method public int checkSlicePermission(android.net.Uri, int, int);















    method public java.util.List<android.net.Uri> getPinnedSlices();















    method public java.util.Set<android.app.slice.SliceSpec> getPinnedSpecs(android.net.Uri);









@@ -7303,7 +7295,6 @@ package android.app.slice {













    method public void grantSlicePermission(java.lang.String, android.net.Uri);















    method public android.net.Uri mapIntentToUri(android.content.Intent);















    method public void pinSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated void pinSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);















    method public void revokeSlicePermission(java.lang.String, android.net.Uri);















    method public void unpinSlice(android.net.Uri);















    field public static final java.lang.String CATEGORY_SLICE = "android.app.slice.category.SLICE";









@@ -7324,7 +7315,6 @@ package android.app.slice {













    method public final java.lang.String getType(android.net.Uri);















    method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);















    method public android.app.slice.Slice onBindSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);















    method public android.app.PendingIntent onCreatePermissionRequest(android.net.Uri);















    method public java.util.Collection<android.net.Uri> onGetSliceDescendants(android.net.Uri);















    method public android.net.Uri onMapIntentToUri(android.content.Intent);










@@ -42057,7 +42047,6 @@ package android.telephony {













  }





























  public class NetworkScan {













    method public deprecated void stop() throws android.os.RemoteException;















    method public void stopScan();















    field public static final int ERROR_INTERRUPTED = 10002; // 0x2712















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










@@ -42521,7 +42510,6 @@ package android.telephony {













    method public boolean isWorldPhone();















    method public void listen(android.telephony.PhoneStateListener, int);















    method public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);













    method public deprecated android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);















    method public void sendDialerSpecialCode(java.lang.String);















    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);















    method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

























api/removed.txt



+42
−0




























Original line number
Diff line number
Diff line








@@ -72,6 +72,36 @@ package android.app.job {





























}





























package android.app.slice {



























  public final class Slice implements android.os.Parcelable {













    field public static final deprecated java.lang.String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";













    field public static final deprecated java.lang.String SUBTYPE_SLIDER = "slider";













  }



























  public static class Slice.Builder {













    ctor public deprecated Slice.Builder(android.net.Uri);













    method public deprecated android.app.slice.Slice.Builder addTimestamp(long, java.lang.String, java.util.List<java.lang.String>);













    method public deprecated android.app.slice.Slice.Builder setSpec(android.app.slice.SliceSpec);













  }



























  public final class SliceItem implements android.os.Parcelable {













    method public deprecated long getTimestamp();













    field public static final deprecated java.lang.String FORMAT_TIMESTAMP = "long";













  }



























  public class SliceManager {













    method public deprecated android.app.slice.Slice bindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice bindSlice(android.content.Intent, java.util.List<android.app.slice.SliceSpec>);













    method public deprecated void pinSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













  }



























  public abstract class SliceProvider extends android.content.ContentProvider {













    method public deprecated android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













  }



























}





























package android.app.usage {































  public final class StorageStats implements android.os.Parcelable {










@@ -516,6 +546,18 @@ package android.speech.tts {





























}





























package android.telephony {



























  public class NetworkScan {













    method public deprecated void stop() throws android.os.RemoteException;













  }



























  public class TelephonyManager {













    method public deprecated android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, android.telephony.TelephonyScanManager.NetworkScanCallback);













  }



























}





























package android.text.format {































  public class DateFormat {

































api/system-current.txt



+0
−13




























Original line number
Diff line number
Diff line








@@ -4366,7 +4366,6 @@ package android.security.keystore.recovery {













    method public byte[] getServerParams();















    method public int getSnapshotVersion();















    method public java.security.cert.CertPath getTrustedHardwareCertPath();













    method public deprecated byte[] getTrustedHardwarePublicKey();















    method public java.util.List<android.security.keystore.recovery.WrappedApplicationKey> getWrappedApplicationKeys();















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















    field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyChainSnapshot> CREATOR;









@@ -4391,26 +4390,19 @@ package android.security.keystore.recovery {





























  public class RecoveryController {















    method public android.security.keystore.recovery.RecoverySession createRecoverySession();













    method public byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;















    method public java.security.Key generateKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public java.util.List<java.lang.String> getAliases() throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);















    method public java.security.Key getKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, java.security.UnrecoverableKeyException;















    method public android.security.keystore.recovery.KeyChainSnapshot getKeyChainSnapshot() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public int getRecoveryStatus(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public java.util.Map<java.lang.String, java.security.cert.X509Certificate> getRootCertificates();















    method public java.security.Key importKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void initRecoveryService(java.lang.String, byte[], byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public static boolean isRecoverableKeyStoreEnabled(android.content.Context);















    method public void removeKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setRecoverySecretTypes(int[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;















    method public void setRecoveryStatus(java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setServerParams(byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setSnapshotCreatedPendingIntent(android.app.PendingIntent) throws android.security.keystore.recovery.InternalRecoveryServiceException;









@@ -4422,9 +4414,6 @@ package android.security.keystore.recovery {













  public class RecoverySession implements java.lang.AutoCloseable {















    method public void close();















    method public java.util.Map<java.lang.String, java.security.Key> recoverKeyChainSnapshot(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public byte[] start(java.lang.String, java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















  }

























@@ -4434,7 +4423,6 @@ package android.security.keystore.recovery {





























  public final class WrappedApplicationKey implements android.os.Parcelable {















    method public int describeContents();













    method public deprecated byte[] getAccount();















    method public java.lang.String getAlias();















    method public byte[] getEncryptedKeyMaterial();















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









@@ -4444,7 +4432,6 @@ package android.security.keystore.recovery {













  public static class WrappedApplicationKey.Builder {















    ctor public WrappedApplicationKey.Builder();















    method public android.security.keystore.recovery.WrappedApplicationKey build();













    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);















    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setAlias(java.lang.String);















    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setEncryptedKeyMaterial(byte[]);















  }

































api/system-removed.txt



+32
−0




























Original line number
Diff line number
Diff line








@@ -91,6 +91,38 @@ package android.os {





























}





























package android.security.keystore.recovery {



























  public final class KeyChainSnapshot implements android.os.Parcelable {













    method public deprecated byte[] getTrustedHardwarePublicKey();













  }



























  public class RecoveryController {













    method public deprecated byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;













  }



























  public class RecoverySession implements java.lang.AutoCloseable {













    method public deprecated java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













  }



























  public final class WrappedApplicationKey implements android.os.Parcelable {













    method public deprecated byte[] getAccount();













  }



























  public static class WrappedApplicationKey.Builder {













    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);













  }



























}





























package android.service.notification {































  public abstract class NotificationListenerService extends android.app.Service {

































core/java/android/app/slice/Slice.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -197,6 +197,7 @@ public final class Slice implements Parcelable {













    /**















     * Key to retrieve an extra added to an intent when the value of a slider is changed.















     * @deprecated remove once support lib is update to use EXTRA_RANGE_VALUE instead













     * @removed















     */















    @Deprecated















    public static final String EXTRA_SLIDER_VALUE = "android.app.slice.extra.SLIDER_VALUE";










@@ -224,6 +225,7 @@ public final class Slice implements Parcelable {













    /**















     * Subtype to tag an item as representing a slider.















     * @deprecated remove once support lib is update to use SUBTYPE_RANGE instead













     * @removed















     */















    @Deprecated















    public static final String SUBTYPE_SLIDER = "slider";










@@ -360,6 +362,7 @@ public final class Slice implements Parcelable {





























        /**















         * @deprecated TO BE REMOVED













         * @removed















         */















        @Deprecated















        public Builder(@NonNull Uri uri) {










@@ -388,7 +391,7 @@ public final class Slice implements Parcelable {





























        /**















         * Tells the system whether for this slice the return value of













         * {@link SliceProvider#onBindSlice(Uri, List)} may be different depending on













         * {@link SliceProvider#onBindSlice(Uri, java.util.Set)} may be different depending on















         * {@link SliceProvider#getCallingPackage()} and should not be cached for multiple















         * apps.















         */









@@ -411,6 +414,7 @@ public final class Slice implements Parcelable {





























        /**















         * @deprecated TO BE REMOVED













         * @removed















         */















        public Builder setSpec(SliceSpec spec) {















            mSpec = spec;










@@ -490,6 +494,7 @@ public final class Slice implements Parcelable {





























        /**















         * @deprecated TO BE REMOVED.













         * @removed















         */















        @Deprecated















        public Slice.Builder addTimestamp(long time, @Nullable @SliceSubtype String subType,