Merge "[Ravenwood] Move redirection classes out of f/b/r" into main (96ba9ef3) · Commits · e / os / android_frameworks_base

core/java/android/database/CursorWindow.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ import dalvik.system.CloseGuard;
		* </p>
		*/
		@RavenwoodKeepWholeClass
		@RavenwoodRedirectionClass("CursorWindow_host")
		@RavenwoodRedirectionClass("CursorWindow_ravenwood")
		public class CursorWindow extends SQLiteClosable implements Parcelable {
		private static final String STATS_TAG = "CursorWindowStats";

ravenwood/runtime-helper-src/framework/android/database/CursorWindow_host.java→core/java/android/database/CursorWindow_ravenwood.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.database;

		import android.database.sqlite.SQLiteException;
		import android.os.Parcel;
		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
		import android.util.Base64;

		import java.text.DecimalFormat;
		@@ -26,9 +27,10 @@ import java.util.Arrays;
		import java.util.HashMap;
		import java.util.List;

		public class CursorWindow_host {
		@RavenwoodKeepWholeClass
		class CursorWindow_ravenwood {

		private static final HashMap<Long, CursorWindow_host> sInstances = new HashMap<>();
		private static final HashMap<Long, CursorWindow_ravenwood> sInstances = new HashMap<>();
		private static long sNextId = 1;

		private String mName;
		@@ -41,7 +43,7 @@ public class CursorWindow_host {
		private final List<Row> mRows = new ArrayList<>();

		public static long nativeCreate(String name, int cursorWindowSize) {
		CursorWindow_host instance = new CursorWindow_host();
		CursorWindow_ravenwood instance = new CursorWindow_ravenwood();
		instance.mName = name;
		long instanceId = sNextId++;
		sInstances.put(instanceId, instance);
		@@ -66,7 +68,7 @@ public class CursorWindow_host {
		}

		public static boolean nativeAllocRow(long windowPtr) {
		CursorWindow_host instance = sInstances.get(windowPtr);
		CursorWindow_ravenwood instance = sInstances.get(windowPtr);
		Row row = new Row();
		row.mFields = new String[instance.mColumnNum];
		row.mTypes = new int[instance.mColumnNum];
		@@ -76,7 +78,7 @@ public class CursorWindow_host {
		}

		private static boolean put(long windowPtr, String value, int type, int row, int column) {
		CursorWindow_host instance = sInstances.get(windowPtr);
		CursorWindow_ravenwood instance = sInstances.get(windowPtr);
		if (row >= instance.mRows.size() \|\| column >= instance.mColumnNum) {
		return false;
		}
		@@ -87,7 +89,7 @@ public class CursorWindow_host {
		}

		public static int nativeGetType(long windowPtr, int row, int column) {
		CursorWindow_host instance = sInstances.get(windowPtr);
		CursorWindow_ravenwood instance = sInstances.get(windowPtr);
		if (row >= instance.mRows.size() \|\| column >= instance.mColumnNum) {
		return Cursor.FIELD_TYPE_NULL;
		}
		@@ -101,7 +103,7 @@ public class CursorWindow_host {
		}

		public static String nativeGetString(long windowPtr, int row, int column) {
		CursorWindow_host instance = sInstances.get(windowPtr);
		CursorWindow_ravenwood instance = sInstances.get(windowPtr);
		if (row >= instance.mRows.size() \|\| column >= instance.mColumnNum) {
		return null;
		}
		@@ -164,7 +166,7 @@ public class CursorWindow_host {
		}

		public static void nativeWriteToParcel(long windowPtr, Parcel parcel) {
		CursorWindow_host window = sInstances.get(windowPtr);
		CursorWindow_ravenwood window = sInstances.get(windowPtr);
		parcel.writeString(window.mName);
		parcel.writeInt(window.mColumnNum);
		parcel.writeInt(window.mRows.size());
		@@ -176,7 +178,7 @@ public class CursorWindow_host {

		public static long nativeCreateFromParcel(Parcel parcel) {
		long windowPtr = nativeCreate(null, 0);
		CursorWindow_host window = sInstances.get(windowPtr);
		CursorWindow_ravenwood window = sInstances.get(windowPtr);
		window.mName = parcel.readString();
		window.mColumnNum = parcel.readInt();
		int rowCount = parcel.readInt();

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ import java.util.concurrent.locks.ReentrantLock;
		* {@link Looper#myQueue() Looper.myQueue()}.
		*/
		@RavenwoodKeepWholeClass
		@RavenwoodRedirectionClass("MessageQueue_host")
		@RavenwoodRedirectionClass("MessageQueue_ravenwood")
		public final class MessageQueue {
		private static final String TAG_L = "LegacyMessageQueue";
		private static final String TAG_C = "ConcurrentMessageQueue";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ import java.util.concurrent.locks.ReentrantLock;
		* {@link Looper#myQueue() Looper.myQueue()}.
		*/
		@RavenwoodKeepWholeClass
		@RavenwoodRedirectionClass("MessageQueue_host")
		@RavenwoodRedirectionClass("MessageQueue_ravenwood")
		public final class MessageQueue {
		private static final String TAG = "ConcurrentMessageQueue";
		private static final boolean DEBUG = false;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicLong;
		* {@link Looper#myQueue() Looper.myQueue()}.
		*/
		@RavenwoodKeepWholeClass
		@RavenwoodRedirectionClass("MessageQueue_host")
		@RavenwoodRedirectionClass("MessageQueue_ravenwood")
		public final class MessageQueue {
		private static final String TAG = "MessageQueue";
		private static final boolean DEBUG = false;