Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate account-specific activity subclass" am: b7c5d354fb

Browse Source 
am: 310697d68d

Change-Id: I1e6622b5d481938c1f5df8f4964284ef56c34cc3
This commit is contained in:
Charles Munger
2019-11-19 15:42:53 -08:00
committed by android-build-merger
parent aeed8fb461 310697d68d
commit 3dd92afd74
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -3021,9 +3021,9 @@ package android.accounts {
field public final String type; field public final String type;
} }
public class AccountAuthenticatorActivity extends android.app.Activity { @Deprecated public class AccountAuthenticatorActivity extends android.app.Activity {
ctor public AccountAuthenticatorActivity(); ctor @Deprecated public AccountAuthenticatorActivity();
method public final void setAccountAuthenticatorResult(android.os.Bundle); method @Deprecated public final void setAccountAuthenticatorResult(android.os.Bundle);
} }
public class AccountAuthenticatorResponse implements android.os.Parcelable { public class AccountAuthenticatorResponse implements android.os.Parcelable {

2
core/java/android/accounts/AbstractAccountAuthenticator.java
View File

@@ -103,8 +103,6 @@ import java.util.Arrays;
* When writing an activity to satisfy these requests one must pass in the AccountManagerResponse * 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 * 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). * 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 { public abstract class AbstractAccountAuthenticator {
private static final String TAG = "AccountAuthenticator"; private static final String TAG = "AccountAuthenticator";

4
core/java/android/accounts/AccountAuthenticatorActivity.java
View File

@@ -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 * 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} * is never set or if it is set to null then error {@link AccountManager#ERROR_CODE_CANCELED}
* will be called on the response. * 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 { public class AccountAuthenticatorActivity extends Activity {
private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null; private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
private Bundle mResultBundle = null; private Bundle mResultBundle = null;