Snap for 12337246 from 6a9fc80a9dfbf5342eba8ecea48c428ec747eced to 24Q4-release (c990d6e7) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ import android.util.Log;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.util.XmlUtils;
		import com.android.modules.expresslog.Counter;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;
		@@ -12805,6 +12806,8 @@ public class Intent implements Parcelable, Cloneable {
		new ClipData.Item(text, htmlText, null, stream));
		setClipData(clipData);
		if (stream != null) {
		logCounterIfFlagsMissing(FLAG_GRANT_READ_URI_PERMISSION,
		"intents.value_explicit_uri_grant_for_send_action");
		addFlags(FLAG_GRANT_READ_URI_PERMISSION);
		}
		return true;
		@@ -12846,6 +12849,8 @@ public class Intent implements Parcelable, Cloneable {

		setClipData(clipData);
		if (streams != null) {
		logCounterIfFlagsMissing(FLAG_GRANT_READ_URI_PERMISSION,
		"intents.value_explicit_uri_grant_for_send_multiple_action");
		addFlags(FLAG_GRANT_READ_URI_PERMISSION);
		}
		return true;
		@@ -12865,6 +12870,10 @@ public class Intent implements Parcelable, Cloneable {
		putExtra(MediaStore.EXTRA_OUTPUT, output);

		setClipData(ClipData.newRawUri("", output));

		logCounterIfFlagsMissing(
		FLAG_GRANT_WRITE_URI_PERMISSION \| FLAG_GRANT_READ_URI_PERMISSION,
		"intents.value_explicit_uri_grant_for_image_capture_action");
		addFlags(FLAG_GRANT_WRITE_URI_PERMISSION\|FLAG_GRANT_READ_URI_PERMISSION);
		return true;
		}
		@@ -12873,6 +12882,12 @@ public class Intent implements Parcelable, Cloneable {
		return false;
		}

		private void logCounterIfFlagsMissing(int requiredFlags, String metricId) {
		if ((getFlags() & requiredFlags) != requiredFlags) {
		Counter.logIncrement(metricId);
		}
		}

		@android.ravenwood.annotation.RavenwoodThrow
		private Uri maybeConvertFileToContentUri(Context context, Uri uri) {
		if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())

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;