Snap for 13318967 from c067b81eb4bae553b1d83de3ce3ad5a605e922a5 to 25Q3-release (7463a781) · Commits · e / os / android_frameworks_base

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

+5 −14

Original line number	Diff line number	Diff line
		@@ -148,10 +148,6 @@ public final class MessageQueue {
		return mMessage.when;
		}

		boolean isRemovedFromStack() {
		return mRemovedFromStackValue;
		}

		boolean removeFromStack() {
		return sRemovedFromStack.compareAndSet(this, false, true);
		}
		@@ -1221,16 +1217,10 @@ public final class MessageQueue {
		StateNode bottom = getStateNode(top);

		/*
		* If the top node is a state node, there are no reachable messages.
		* If it's anything other than Active, we can quit as we know that next() is not
		* consuming items.
		* If the top node is Active then we know that next() is currently consuming items.
		* In that case we should wait next() has drained the stack.
		* If the top node is a state node, there are no reachable messages. We should still
		* wait for next to complete draining the stack.
		*/
		if (top == bottom) {
		if (bottom != sStackStateActive) {
		return false;
		}
		waitForDrainCompleted();
		return false;
		}
		@@ -1258,7 +1248,7 @@ public final class MessageQueue {
		}
		}
		} else {
		return true;
		break;
		}
		}

		@@ -1268,7 +1258,6 @@ public final class MessageQueue {
		if (DEBUG) {
		Log.d(TAG, "stackHasMessages next() is walking the stack, we must re-sample");
		}
		waitForDrainCompleted();
		break;
		}
		if (!n.isMessageNode()) {
		@@ -1278,6 +1267,8 @@ public final class MessageQueue {
		p = (MessageNode) n;
		}

		waitForDrainCompleted();

		return found;
		}

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2025 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item>
		<shape android:shape="rectangle">
		<solid android:color="@androidprv:color/materialColorPrimaryContainer"/>
		<corners android:radius="@dimen/settingslib_switch_bar_radius"/>
		</shape>
		</item>
		</ripple>

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2025 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item>
		<shape android:shape="rectangle">
		<solid android:color="@androidprv:color/materialColorPrimary"/>
		<corners android:radius="@dimen/settingslib_switch_bar_radius"/>
		</shape>
		</item>
		</ripple>

0 → 100644

+486 −0

File added.

Preview size limit exceeded, changes collapsed.

+8 −0

Original line number	Diff line number	Diff line
		@@ -2245,4 +2245,12 @@
		<dimen name="aux_spacing_overlay_panel_shape_radius">46dp</dimen>
		<!-- Spacing attributes to overwrite end -->

		<!-- Tile Details start-->
		<dimen name="internet_details_toggle_row_height">48dp</dimen>
		<dimen name="tile_details_switch_container_width">52dp</dimen>
		<dimen name="tile_details_switch_track_height">24dp</dimen>
		<dimen name="tile_details_button_row_height">40dp</dimen>
		<dimen name="tile_details_button_size">20dp</dimen>
		<!-- Tile Details end -->

		</resources>