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

Commit 47ac4ece authored by John Wu's avatar John Wu
Browse files

[Ravenwood] Move *_host classes into their corresponding package 

This allows the host classes to reference package private members of the
original class. This also makes the redirection class annotation much
cleaner, as the host classes are in the same package.

Bug: 292141694
Flag: EXEMPT host test change only
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: I01c184ddc3c8cf5d075113e310296c67e0b697d1
parent f66934ad

core/java/android/database/CursorWindow.java

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ import dalvik.system.CloseGuard; 
 * </p>

 */

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.CursorWindow_host")

@RavenwoodRedirectionClass("CursorWindow_host")

public class CursorWindow extends SQLiteClosable implements Parcelable {

    private static final String STATS_TAG = "CursorWindowStats";

core/java/android/os/ConcurrentMessageQueue/MessageQueue.java

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ import java.util.concurrent.locks.ReentrantLock; 
 * {@link Looper#myQueue() Looper.myQueue()}.

 */

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.MessageQueue_host")

@RavenwoodRedirectionClass("MessageQueue_host")

public final class MessageQueue {

    private static final String TAG = "ConcurrentMessageQueue";

    private static final boolean DEBUG = false;

core/java/android/os/LegacyMessageQueue/MessageQueue.java

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ import java.util.concurrent.atomic.AtomicLong; 
 * {@link Looper#myQueue() Looper.myQueue()}.

 */

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.MessageQueue_host")

@RavenwoodRedirectionClass("MessageQueue_host")

public final class MessageQueue {

    private static final String TAG = "MessageQueue";

    private static final boolean DEBUG = false;

core/java/android/os/LockedMessageQueue/MessageQueue.java

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ import java.util.concurrent.atomic.AtomicLong; 
 * {@link Looper#myQueue() Looper.myQueue()}.

 */

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.MessageQueue_host")

@RavenwoodRedirectionClass("MessageQueue_host")

public final class MessageQueue {

    private static final String TAG = "LockedMessageQueue";

    private static final boolean DEBUG = false;

core/java/android/os/Parcel.java

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ import java.util.function.IntFunction; 
 * {@link #readSparseArray(ClassLoader, Class)}.

 */

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.Parcel_host")

@RavenwoodRedirectionClass("Parcel_host")

public final class Parcel {



    private static final boolean DEBUG_RECYCLE = false;