Snap for 8843235 from eec7bcb14af5785e8aecae15680569d735d9cc0d to tm-qpr1-release (2739cf58) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityTransitionState.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,11 @@ class ActivityTransitionState {
		// After orientation change, the onResume can come in before the top Activity has
		// left, so if the Activity is not top, wait a second for the top Activity to exit.
		if (mEnterTransitionCoordinator == null \|\| activity.isTopOfTask()) {
		if (mEnterTransitionCoordinator != null) {
		mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
		mEnterTransitionCoordinator = null;
		});
		}
		restoreExitedViews();
		restoreReenteringViews();
		} else {
		@@ -271,6 +276,11 @@ class ActivityTransitionState {
		public void run() {
		if (mEnterTransitionCoordinator == null \|\|
		mEnterTransitionCoordinator.isWaitingForRemoteExit()) {
		if (mEnterTransitionCoordinator != null) {
		mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
		mEnterTransitionCoordinator = null;
		});
		}
		restoreExitedViews();
		restoreReenteringViews();
		} else if (mEnterTransitionCoordinator.isReturning()) {

core/java/android/hardware/radio/ProgramList.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,11 @@ import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.ArrayMap;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		@@ -41,7 +42,7 @@ public final class ProgramList implements AutoCloseable {

		private final Object mLock = new Object();
		private final Map<ProgramSelector.Identifier, RadioManager.ProgramInfo> mPrograms =
		new HashMap<>();
		new ArrayMap<>();

		private final List<ListCallback> mListCallbacks = new ArrayList<>();
		private final List<OnCompleteListener> mOnCompleteListeners = new ArrayList<>();
		@@ -184,8 +185,14 @@ public final class ProgramList implements AutoCloseable {
		listCallbacksCopied = new ArrayList<>(mListCallbacks);

		if (chunk.isPurge()) {
		for (ProgramSelector.Identifier id : mPrograms.keySet()) {
		removeLocked(id, removedList);
		Iterator<Map.Entry<ProgramSelector.Identifier, RadioManager.ProgramInfo>>
		programsIterator = mPrograms.entrySet().iterator();
		while (programsIterator.hasNext()) {
		RadioManager.ProgramInfo removed = programsIterator.next().getValue();
		if (removed != null) {
		removedList.add(removed.getSelector().getPrimaryId());
		}
		programsIterator.remove();
		}
		}

core/java/android/view/WindowLayout.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -118,11 +118,11 @@ public class WindowLayout {
		}
		if (cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES) {
		if (displayFrame.width() < displayFrame.height()) {
		displayCutoutSafeExceptMaybeBars.top = MIN_Y;
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		} else {
		displayCutoutSafeExceptMaybeBars.left = MIN_X;
		displayCutoutSafeExceptMaybeBars.right = MAX_X;
		displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE;
		displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE;
		}
		}
		final boolean layoutInsetDecor = (attrs.flags & FLAG_LAYOUT_INSET_DECOR) != 0;
		@@ -132,23 +132,23 @@ public class WindowLayout {
		final Insets systemBarsInsets = state.calculateInsets(
		displayFrame, WindowInsets.Type.systemBars(), requestedVisibilities);
		if (systemBarsInsets.left > 0) {
		displayCutoutSafeExceptMaybeBars.left = MIN_X;
		displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE;
		}
		if (systemBarsInsets.top > 0) {
		displayCutoutSafeExceptMaybeBars.top = MIN_Y;
		displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE;
		}
		if (systemBarsInsets.right > 0) {
		displayCutoutSafeExceptMaybeBars.right = MAX_X;
		displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE;
		}
		if (systemBarsInsets.bottom > 0) {
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		}
		}
		if (type == TYPE_INPUT_METHOD) {
		final InsetsSource navSource = state.peekSource(ITYPE_NAVIGATION_BAR);
		if (navSource != null && navSource.calculateInsets(displayFrame, true).bottom > 0) {
		// The IME can always extend under the bottom cutout if the navbar is there.
		displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;
		displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE;
		}
		}
		final boolean attachedInParent = attachedWindowFrame != null && !layoutInScreen;

core/java/android/view/WindowManagerGlobal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ public final class WindowManagerGlobal {
		try {
		root.setView(view, wparams, panelParentView, userId);
		} catch (RuntimeException e) {
		final int viewIndex = findViewLocked(view, false);
		final int viewIndex = (index >= 0) ? index : (mViews.size() - 1);
		// BadTokenException or InvalidDisplayException, clean up.
		if (viewIndex >= 0) {
		removeViewLocked(viewIndex, true);

core/res/res/values-am/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@
		<string name="permdesc_writeContacts" product="default" msgid="8304795696237065281">"መተግበሪያው በእርስዎ ስልክ ላይ ስለተከማቹ እውቂያዎችዎ ያለ ውሂብን እንዲቀይር ያስችለዋል። ይህ ፈቃድ መተግበሪያዎች የእውቂያ ውሂብን እንዲሰርዙ ያስችላቸዋል።"</string>
		<string name="permlab_readCallLog" msgid="1739990210293505948">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</string>
		<string name="permdesc_readCallLog" msgid="8964770895425873433">"ይህ መተግበሪያ የእርስዎን የጥሪ ታሪክ ማንበብ ይችላል።"</string>
		<string name="permlab_writeCallLog" msgid="670292975137658895">"የጥሪ ምዝግብ ማስታወሻን ፃፍ"</string>
		<string name="permlab_writeCallLog" msgid="670292975137658895">"የጥሪ ምዝግብ ማስታወሻን ጻፍ"</string>
		<string name="permdesc_writeCallLog" product="tablet" msgid="2657525794731690397">"ስለ ገቢ እና ወጪ ጥሪዎችን ውሂብ ጨምሮ፣ የጡባዊተኮህን ምዝግብ ማስታወሻ ለመቀየር ለመተግበሪያው ይፈቅዳል። ይሄንን ተንኮል አዘል መተግበሪያዎች የስልክህን ምዝግብ ማስታወሻ ለመሰረዝ ወይም ለመለወጥ ሊጠቀሙበት ይችላሉ።"</string>
		<string name="permdesc_writeCallLog" product="tv" msgid="3934939195095317432">"መተግበሪያው ስለገቢ እና ወጪ ጥሪዎች ያለ ውሂብም ጨምሮ የእርስዎ Android TV መሣሪያ ምዝግብ ማስታወሻ እንዲቀይር ያስችለዋል። ተንኮል-አዘል መተግበሪያዎች ይህን ተጠቅመው የስልክዎን ምዝግብ ማስታወሻ ሊደመስሱ ወይም ሊቀይሩ ይችላሉ።"</string>
		<string name="permdesc_writeCallLog" product="default" msgid="5903033505665134802">"ስለ ገቢ እና ወጪ ጥሪዎችን ውሂብ ጨምሮ፣ የስልክህን ምዝግብ ማስታወሻ ለመቀየር ለመተግበሪያው ይፈቅዳል። ይሄንን ተንኮል አዘል መተግበሪያዎች የስልክህን ምዝግብ ማስታወሻ ለመሰረዝ ወይም ለመለወጥ ሊጠቀሙበት ይችላሉ።"</string>