From cb4dd8090b0e68aa185ba1a8a13686c38311d0db Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 21 Apr 2017 16:25:47 -0700 Subject: [PATCH] Hide deprecated APIs. Test: CtsAutoFillServiceTestCases pass Bug: 37563972 Change-Id: Ia5f33c5624b7a6be3c152e126c99800914d23cbd --- api/current.txt | 5 ----- api/system-current.txt | 5 ----- api/test-current.txt | 5 ----- core/java/android/service/autofill/AutofillService.java | 5 +++++ core/java/android/service/autofill/FillResponse.java | 1 + core/java/android/view/autofill/AutofillManager.java | 6 ++---- 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/api/current.txt b/api/current.txt index 8baca126033a5..1e1ee66117d7f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37036,15 +37036,12 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final deprecated void disableSelf(); method public final android.service.autofill.FillEventHistory getFillEventHistory(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback); - method public abstract deprecated void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback); method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback); - method public abstract deprecated void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback); field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService"; field public static final java.lang.String SERVICE_META_DATA = "android.autofill"; } @@ -37118,7 +37115,6 @@ package android.service.autofill { method public android.service.autofill.FillResponse build(); method public android.service.autofill.FillResponse.Builder setAuthentication(android.view.autofill.AutofillId[], android.content.IntentSender, android.widget.RemoteViews); method public android.service.autofill.FillResponse.Builder setClientState(android.os.Bundle); - method public deprecated android.service.autofill.FillResponse.Builder setExtras(android.os.Bundle); method public android.service.autofill.FillResponse.Builder setIgnoredIds(android.view.autofill.AutofillId...); method public android.service.autofill.FillResponse.Builder setSaveInfo(android.service.autofill.SaveInfo); } @@ -47852,7 +47848,6 @@ package android.view.autofill { field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS"; - field public static final deprecated int FLAG_MANUAL_REQUEST = 1; // 0x1 } public static abstract class AutofillManager.AutofillCallback { diff --git a/api/system-current.txt b/api/system-current.txt index 5945abc802a07..57777db44f140 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -40151,15 +40151,12 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final deprecated void disableSelf(); method public final android.service.autofill.FillEventHistory getFillEventHistory(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback); - method public abstract deprecated void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback); method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback); - method public abstract deprecated void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback); field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService"; field public static final java.lang.String SERVICE_META_DATA = "android.autofill"; } @@ -40233,7 +40230,6 @@ package android.service.autofill { method public android.service.autofill.FillResponse build(); method public android.service.autofill.FillResponse.Builder setAuthentication(android.view.autofill.AutofillId[], android.content.IntentSender, android.widget.RemoteViews); method public android.service.autofill.FillResponse.Builder setClientState(android.os.Bundle); - method public deprecated android.service.autofill.FillResponse.Builder setExtras(android.os.Bundle); method public android.service.autofill.FillResponse.Builder setIgnoredIds(android.view.autofill.AutofillId...); method public android.service.autofill.FillResponse.Builder setSaveInfo(android.service.autofill.SaveInfo); } @@ -51433,7 +51429,6 @@ package android.view.autofill { field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS"; - field public static final deprecated int FLAG_MANUAL_REQUEST = 1; // 0x1 } public static abstract class AutofillManager.AutofillCallback { diff --git a/api/test-current.txt b/api/test-current.txt index eac5b8028f99e..d91b78c2c587f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37190,15 +37190,12 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method public final deprecated void disableSelf(); method public final android.service.autofill.FillEventHistory getFillEventHistory(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback); - method public abstract deprecated void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback); method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback); - method public abstract deprecated void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback); field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService"; field public static final java.lang.String SERVICE_META_DATA = "android.autofill"; } @@ -37272,7 +37269,6 @@ package android.service.autofill { method public android.service.autofill.FillResponse build(); method public android.service.autofill.FillResponse.Builder setAuthentication(android.view.autofill.AutofillId[], android.content.IntentSender, android.widget.RemoteViews); method public android.service.autofill.FillResponse.Builder setClientState(android.os.Bundle); - method public deprecated android.service.autofill.FillResponse.Builder setExtras(android.os.Bundle); method public android.service.autofill.FillResponse.Builder setIgnoredIds(android.view.autofill.AutofillId...); method public android.service.autofill.FillResponse.Builder setSaveInfo(android.service.autofill.SaveInfo); } @@ -48231,7 +48227,6 @@ package android.view.autofill { field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; field public static final java.lang.String EXTRA_DATA_EXTRAS = "android.view.autofill.extra.DATA_EXTRAS"; - field public static final deprecated int FLAG_MANUAL_REQUEST = 1; // 0x1 } public static abstract class AutofillManager.AutofillCallback { diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java index 813c54f53db93..029acba8af1a6 100644 --- a/core/java/android/service/autofill/AutofillService.java +++ b/core/java/android/service/autofill/AutofillService.java @@ -229,6 +229,8 @@ public abstract class AutofillService extends Service { * this to notify you that the fill result is no longer needed and you should stop * handling this fill request in order to save resources. * @param callback object used to notify the result of the request. + * + * @hide */ @Deprecated public abstract void onFillRequest(@NonNull AssistStructure structure, @Nullable Bundle data, @@ -267,6 +269,8 @@ public abstract class AutofillService extends Service { * conserve resources. * See {@link FillResponse} for examples of multiple-sections requests. * @param callback object used to notify the result of the request. + * + * @hide */ @Deprecated public abstract void onSaveRequest(@NonNull AssistStructure structure, @Nullable Bundle data, @@ -280,6 +284,7 @@ public abstract class AutofillService extends Service { public void onDisconnected() { } + /** @hide */ @Deprecated public final void disableSelf() { // TODO(b/33197203): Remove when GCore has migrated off this API diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 68ce0b52c0701..f64efdae9e785 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -311,6 +311,7 @@ public final class FillResponse implements Parcelable { /** * @deprecated Use {@link #setClientState(Bundle)} instead. + * @hide */ @Deprecated public Builder setExtras(@Nullable Bundle extras) { diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 981be21f4f612..79535ae04352a 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -101,17 +101,15 @@ public final class AutofillManager { static final String SESSION_ID_TAG = "android:sessionId"; static final String LAST_AUTOFILLED_DATA_TAG = "android:lastAutoFilledData"; - // Public flags start from the lowest bit /** - * Indicates autofill was explicitly requested by the user. - * * @deprecated Use {@link android.service.autofill.FillRequest#FLAG_MANUAL_REQUEST} + * @hide */ // TODO(b/33197203): remove (and change value of private flags) @Deprecated public static final int FLAG_MANUAL_REQUEST = 0x1; - // Private flags start from the highest bit + // TODO(b/37563972): start from 0x1 once FLAG_MANUAL_REQUEST is gone /** @hide */ public static final int FLAG_START_SESSION = 0x80000000; /** @hide */ public static final int FLAG_VIEW_ENTERED = 0x40000000; /** @hide */ public static final int FLAG_VIEW_EXITED = 0x20000000;