Merge cherrypicks of [16141748, 16140010, 16150137] into sc-qpr1-d-release. (86c4845b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -899,7 +899,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb

		@Override
		public boolean bouncerIsOrWillBeShowing() {
		return mBouncer.isShowing() \|\| mBouncer.getShowingSoon();
		return isBouncerShowing() \|\| mBouncer.getShowingSoon();
		}

		public boolean isFullscreenBouncer() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		@Mock
		private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
		@Mock
		private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor;
		@Mock
		private KeyguardMessageArea mKeyguardMessageArea;

		private WakefulnessLifecycle mWakefulnessLifecycle;
		@@ -286,6 +288,24 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		verify(cancelAction, never()).run();
		}

		@Test
		public void testShowing_whenAlternateAuthShowing() {
		mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor);
		when(mBouncer.isShowing()).thenReturn(false);
		when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true);
		assertTrue("Is showing not accurate when alternative auth showing",
		mStatusBarKeyguardViewManager.isShowing());
		}

		@Test
		public void testWillBeShowing_whenAlternateAuthShowing() {
		mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor);
		when(mBouncer.isShowing()).thenReturn(false);
		when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true);
		assertTrue("Is or will be showing not accurate when alternative auth showing",
		mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing());
		}

		@Test
		public void testUpdateResources_delegatesToBouncer() {
		mStatusBarKeyguardViewManager.updateResources();

services/uwb/java/com/android/server/uwb/UwbServiceImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ public class UwbServiceImpl extends IUwbAdapter.Stub implements IBinder.DeathRec
		private void handleAirplaneModeEvent() {
		try {
		getVendorUwbAdapter().setEnabled(isEnabled());
		} catch (RemoteException e) {
		} catch (RemoteException \| IllegalStateException e) {
		Log.e(TAG, "Unable to set UWB Adapter state.", e);
		}
		}

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -962,6 +962,21 @@ public class CarrierConfigManager {
		public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL
		= "carrier_use_ims_first_for_emergency_bool";

		/**
		* When {@code true}, the determination of whether to place a call as an emergency call will be
		* based on the known {@link android.telephony.emergency.EmergencyNumber}s for the SIM on which
		* the call is being placed. In a dual SIM scenario, if Sim A has the emergency numbers
		* 123, 456 and Sim B has the emergency numbers 789, and the user places a call on SIM A to 789,
		* it will not be treated as an emergency call in this case.
		* When {@code false}, the determination is based on the emergency numbers from all device SIMs,
		* regardless of which SIM the call is being placed on. If Sim A has the emergency numbers
		* 123, 456 and Sim B has the emergency numbers 789, and the user places a call on SIM A to 789,
		* the call will be dialed as an emergency number, but with an unspecified routing.
		* @hide
		*/
		public static final String KEY_USE_ONLY_DIALED_SIM_ECC_LIST_BOOL =
		"use_only_dialed_sim_ecc_list_bool";

		/**
		* When IMS instant lettering is available for a carrier (see
		* {@link #KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL}), determines the list of characters
		@@ -5230,6 +5245,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);
		sDefaults.putBoolean(KEY_USE_ONLY_DIALED_SIM_ECC_LIST_BOOL, false);
		sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");
		sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");
		sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING, "");