Merge cherrypicks of [19509981, 18494316, 19509200] into tm-d1-release. (7a6324e3) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

+8 −14

Original line number	Diff line number	Diff line
		@@ -16,12 +16,9 @@
		* limitations under the License.
		*/
		-->
		<ripple
		<shape
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:color="?android:attr/textColorPrimary">
		<item>
		<shape
		android:shape="rectangle">
		<solid android:color="?androidprv:attr/colorSurface"/>
		<size
		@@ -29,6 +26,3 @@
		android:height="@dimen/keyguard_affordance_height"/>
		<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
		</shape>
		</item>
		</ripple>

+6 −0

Original line number	Diff line number	Diff line
		@@ -2494,6 +2494,12 @@ public class CentralSurfacesImpl extends CoreStartable implements
		animate, intent.getPackage(), (adapter) -> {
		ActivityOptions options = new ActivityOptions(
		CentralSurfaces.getActivityOptions(mDisplayId, adapter));

		// We know that the intent of the caller is to dismiss the keyguard and
		// this runnable is called right after the keyguard is solved, so we tell
		// WM that we should dismiss it to avoid flickers when opening an activity
		// that can also be shown over the keyguard.
		options.setDismissKeyguard();
		options.setDisallowEnterPictureInPictureWhileLaunching(
		disallowEnterPictureInPictureWhileLaunching);
		if (CameraIntents.isInsecureCameraIntent(intent)) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -733,8 +733,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		}
		mNotificationShadeWindowController.setKeyguardOccluded(mOccluded);

		// setDozing(false) will call reset once we stop dozing.
		if (!mDozing) {
		// setDozing(false) will call reset once we stop dozing. Also, if we're going away, there's
		// no need to reset the keyguard views as we'll be gone shortly. Resetting now could cause
		// unexpected visible behavior if the keyguard is still visible as we're animating unlocked.
		if (!mDozing && !mKeyguardStateController.isKeyguardGoingAway()) {
		// If Keyguard is reshown, don't hide the bouncer as it might just have been requested
		// by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
		reset(isOccluding /* hideBouncerWhenShowing*/);

+8 −8

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ public final class AccessNetworkConstants {
		/** @hide */
		public static @RadioAccessNetworkType int fromString(@NonNull String str) {
		switch (str.toUpperCase()) {
		case "UNKNOWN": return UNKNOWN;
		case "GERAN": return GERAN;
		case "UTRAN": return UTRAN;
		case "EUTRAN": return EUTRAN;
		@@ -122,8 +123,7 @@ public final class AccessNetworkConstants {
		case "IWLAN": return IWLAN;
		case "NGRAN": return NGRAN;
		default:
		Rlog.e(TAG, "Invalid access network type " + str);
		return UNKNOWN;
		throw new IllegalArgumentException("Invalid access network type " + str);
		}
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -8550,6 +8550,13 @@ public class CarrierConfigManager {
		* IWLAN handover rules that determine whether handover is allowed or disallowed between
		* cellular and IWLAN.
		*
		* Rule syntax: "source=[GERAN\|UTRAN\|EUTRAN\|NGRAN\|IWLAN\|UNKNOWN], target=[GERAN\|UTRAN\|EUTRAN
		* \|NGRAN\|IWLAN], type=[allowed\|disallowed], roaming=[true\|false], capabilities=[INTERNET\|MMS
		* \|FOTA\|IMS\|CBS\|SUPL\|EIMS\|XCAP\|DUN]"
		*
		* Note that UNKNOWN can be only specified in the source access network and can be only used
		* in the disallowed rule.
		*
		* The handover rules will be matched in the order. Here are some sample rules.
		* <string-array name="iwlan_handover_rules" num="5">
		* <!-- Handover from IWLAN to 2G/3G is not allowed -->