Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master (c557b722) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -542,14 +542,17 @@ public class ApkLiteParseUtils {

		int minVer = DEFAULT_MIN_SDK_VERSION;
		String minCode = null;
		boolean minAssigned = false;
		int targetVer = DEFAULT_TARGET_SDK_VERSION;
		String targetCode = null;

		if (!TextUtils.isEmpty(minSdkVersionString)) {
		try {
		minVer = Integer.parseInt(minSdkVersionString);
		minAssigned = true;
		} catch (NumberFormatException ignored) {
		minCode = minSdkVersionString;
		minAssigned = !TextUtils.isEmpty(minCode);
		}
		}

		@@ -558,7 +561,7 @@ public class ApkLiteParseUtils {
		targetVer = Integer.parseInt(targetSdkVersionString);
		} catch (NumberFormatException ignored) {
		targetCode = targetSdkVersionString;
		if (minCode == null) {
		if (!minAssigned) {
		minCode = targetCode;
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,5 +46,5 @@ oneway interface IRemoteAnimationRunner {
		* won't have any effect anymore.
		*/
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		void onAnimationCancelled();
		void onAnimationCancelled(boolean isKeyguardOccluded);
		}

+12 −4

Original line number	Diff line number	Diff line
		@@ -2804,10 +2804,6 @@ public final class ViewRootImpl implements ViewParent,
		// Execute enqueued actions on every traversal in case a detached view enqueued an action
		getRunQueue().executeActions(mAttachInfo.mHandler);

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		}

		if (mFirst) {
		// make sure touch mode code executes by setting cached value
		// to opposite of the added touch mode.
		@@ -2871,6 +2867,18 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		if (mLayoutRequested) {
		// Short-circuit catching a new layout request here, so
		// we don't need to go through two layout passes when things
		// change due to fitting system windows, which can happen a lot.
		windowSizeMayChange \|= measureHierarchy(host, lp,
		mView.getContext().getResources(),
		desiredWindowWidth, desiredWindowHeight);
		}
		}

		if (layoutRequested) {
		// Clear this now, so that if anything requests a layout in the
		// rest of this function we will catch it and re-run a full

+3 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@

		</LinearLayout>

		<ImageView
		<com.android.internal.widget.CachingIconView
		android:id="@+id/right_icon"
		android:layout_width="@dimen/notification_right_icon_size"
		android:layout_height="@dimen/notification_right_icon_size"
		@@ -150,6 +150,8 @@
		android:clipToOutline="true"
		android:importantForAccessibility="no"
		android:scaleType="centerCrop"
		android:maxDrawableWidth="@dimen/notification_right_icon_size"
		android:maxDrawableHeight="@dimen/notification_right_icon_size"
		/>

		<FrameLayout

+3 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<ImageView
		<com.android.internal.widget.CachingIconView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/right_icon"
		android:layout_width="@dimen/notification_right_icon_size"
		@@ -25,4 +25,6 @@
		android:clipToOutline="true"
		android:importantForAccessibility="no"
		android:scaleType="centerCrop"
		android:maxDrawableWidth="@dimen/notification_right_icon_size"
		android:maxDrawableHeight="@dimen/notification_right_icon_size"
		/>