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

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

Merge changes Idbf1265d,I9a7b56d1,I34c597f6 into main 

* changes:
  More misc `android.os` on Ravenwood.
  More misc `android.util` on Ravenwood.
  Move most Ravenwood policies to annotations.
parents 076ded06 1d261135

core/java/android/os/BadParcelableException.java

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.AndroidRuntimeException; 
 * passed to another process that doesn't have the same {@link Parcelable} class

 * in its {@link ClassLoader}.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class BadParcelableException extends AndroidRuntimeException {

    public BadParcelableException(String msg) {

        super(msg);

core/java/android/os/BadTypeParcelableException.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.os;



/** Used by Parcel to signal that the type on the payload was not expected by the caller. */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

class BadTypeParcelableException extends BadParcelableException {

    BadTypeParcelableException(String msg) {

        super(msg);

core/java/android/os/BaseBundle.java

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import java.util.function.BiFunction; 
 * should work directly with either the {@link Bundle} or

 * {@link PersistableBundle} subclass.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class BaseBundle {

    /** @hide */

    protected static final String TAG = "Bundle";

core/java/android/os/Bundle.java

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import java.util.List; 
 *

 * @see PersistableBundle

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class Bundle extends BaseBundle implements Cloneable, Parcelable {

    @VisibleForTesting

    static final int FLAG_HAS_FDS = 1 << 8;

core/java/android/os/CancellationSignal.java

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
/**

 * Provides the ability to cancel an operation in progress.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class CancellationSignal {

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private boolean mIsCanceled;