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

Commit 310697d6 authored by Charles Munger's avatar Charles Munger Committed by android-build-merger
Browse files

Merge "Deprecate account-specific activity subclass"

am: b7c5d354

Change-Id: Ie21ab07bfe7f857c642e62b11e33085db199a021
parents 97a11fb8 b7c5d354
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -3021,9 +3021,9 @@ package android.accounts {
    field public final String type;
  }
  public class AccountAuthenticatorActivity extends android.app.Activity {
    ctor public AccountAuthenticatorActivity();
    method public final void setAccountAuthenticatorResult(android.os.Bundle);
  @Deprecated public class AccountAuthenticatorActivity extends android.app.Activity {
    ctor @Deprecated public AccountAuthenticatorActivity();
    method @Deprecated public final void setAccountAuthenticatorResult(android.os.Bundle);
  }
  public class AccountAuthenticatorResponse implements android.os.Parcelable {
+0 −2
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ import java.util.Arrays;
 * When writing an activity to satisfy these requests one must pass in the AccountManagerResponse
 * and return the result via that response when the activity finishes (or whenever else  the
 * activity author deems it is the correct time to respond).
 * The {@link AccountAuthenticatorActivity} handles this, so one may wish to extend that when
 * writing activities to handle these requests.
 */
public abstract class AbstractAccountAuthenticator {
    private static final String TAG = "AccountAuthenticator";
+4 −0
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ import android.os.Bundle;
 * This result will be sent as the result of the request when the activity finishes. If this
 * is never set or if it is set to null then error {@link AccountManager#ERROR_CODE_CANCELED}
 * will be called on the response.
 *
 * @deprecated Applications should extend Activity themselves. This class is not compatible with
 *   AppCompat, and the functionality it provides is not complex.
 */
@Deprecated
public class AccountAuthenticatorActivity extends Activity {
    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
    private Bundle mResultBundle = null;