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

Commit 1c018c67 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nov21" into main 

* changes:
  Support simple graphics structs in Ravenwood, with CTS.
  Support Account for Ravenwood, with CTS.
parents e25a5e69 984c23da

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 */

graphics/java/android/graphics/Insets.java

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Parcelable; 
 * Insets are immutable so may be treated as values.

 *

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class Insets implements Parcelable {

    public static final @NonNull Insets NONE = new Insets(0, 0, 0, 0);

graphics/java/android/graphics/Point.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Parcelable; 
/**

 * Point holds two integer coordinates

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class Point implements Parcelable {

    public int x;

    public int y;

graphics/java/android/graphics/PointF.java

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Parcelable; 
/**

 * PointF holds two float coordinates

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class PointF implements Parcelable {

    public float x;

    public float y;

graphics/java/android/graphics/Rect.java

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import java.util.regex.Pattern; 
 * into the column and row described by its left and top coordinates, but not

 * those of its bottom and right.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class Rect implements Parcelable {

    public int left;

    public int top;