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

Commit e1bdce79 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Support Account for Ravenwood, with CTS. 

Support single simple tuple class in Ravenwood.

Bug: 292141694
Test: atest-dev CtsAccountManagerTestCasesRavenwood CtsAccountManagerTestCases
Change-Id: I877cce30d180e87c9715391fb488bc7313156bea
parent c914beed

core/java/android/accounts/Account.java

+17 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import java.util.Set; 
 * {@link Parcelable} and also overrides {@link #equals} and {@link #hashCode}, making it

 * suitable for use as the key of a {@link java.util.Map}

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class Account implements Parcelable {

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private static final String TAG = "Account";
@@ -104,6 +105,14 @@ public class Account implements Parcelable { 
        if (accessId != null) {

            synchronized (sAccessedAccounts) {

                if (sAccessedAccounts.add(this)) {

                    onAccountAccessed(accessId);

                }

            }

        }

    }



    @android.ravenwood.annotation.RavenwoodReplace

    private static void onAccountAccessed(String accessId) {

        try {

            IAccountManager accountManager = IAccountManager.Stub.asInterface(

                    ServiceManager.getService(Context.ACCOUNT_SERVICE));
@@ -112,8 +121,9 @@ public class Account implements Parcelable { 
            Log.e(TAG, "Error noting account access", e);

        }

    }

            }

        }



    private static void onAccountAccessed$ravenwood(String accessId) {

        // No AccountManager to communicate with; ignored

    }



    /** @hide */

ravenwood/ravenwood-annotation-allowed-classes.txt

+2 −0
Original line number Diff line number Diff line
@@ -44,3 +44,5 @@ android.database.Observable 


android.text.TextUtils

android.text.TextUtils$SimpleStringSplitter



android.accounts.Account