Merge "Keep a removed API to not break GCore presubmit" into oc-dev

am: c62250ad52

Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
This commit is contained in:
Svetoslav Ganov
2017-04-11 19:35:51 +00:00
committed by android-build-merger
4 changed files with 4 additions and 1 deletions

View File

@@ -36973,6 +36973,7 @@ 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.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();

View File

@@ -40069,6 +40069,7 @@ 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.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();

View File

@@ -37132,6 +37132,7 @@ 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.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();

View File

@@ -242,7 +242,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
getSystemService(AutofillManager.class).disableOwnedAutofillServices();