Snap for 7629638 from b7bd3b2b27864c91298c1860cea7895a785e4f3e to sc-qpr1-release (2fd779f8) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2862,9 +2862,7 @@
	<activity android:name=".notification.app.ChannelPanelActivity"		<activity android:name=".notification.app.ChannelPanelActivity"
	android:label="@string/notification_channel_title"		android:label="@string/notification_channel_title"
	android:theme="@style/Theme.Panel"		android:theme="@style/Theme.Panel"
	android:launchMode="singleInstance"
	android:excludeFromRecents="true"		android:excludeFromRecents="true"
	android:noHistory="true"
	android:configChanges="orientation\|keyboardHidden\|screenSize"		android:configChanges="orientation\|keyboardHidden\|screenSize"
	android:exported="true">		android:exported="true">
	<intent-filter android:priority="1">		<intent-filter android:priority="1">

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -208,6 +208,8 @@
	<!-- copied from Theme.DeviceDefault.Dialog.Alert -->		<!-- copied from Theme.DeviceDefault.Dialog.Alert -->
	<item name="colorAccent">@*android:color/accent_device_default_dark</item>		<item name="colorAccent">@*android:color/accent_device_default_dark</item>
	<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>		<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>

			<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
	</style>		</style>

	<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">		<style name="SuwAlertDialogThemeCompat.Light" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
	@@ -218,6 +220,8 @@
	<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->		<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
	<item name="colorAccent">@*android:color/accent_device_default_light</item>		<item name="colorAccent">@*android:color/accent_device_default_light</item>
	<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>		<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>

			<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
	</style>		</style>

	<!-- This theme was applied to Settings pages which are running under SUW. -->		<!-- This theme was applied to Settings pages which are running under SUW. -->

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -284,7 +284,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
	launchCredentialOnlyEnroll();		launchCredentialOnlyEnroll();
	finish();		finish();
	} else if (canUseFace && canUseFingerprint) {		} else if (canUseFace && canUseFingerprint) {
	if (mParentalOptionsRequired && mGkPwHandle != null) {		if (mGkPwHandle != null) {
	launchFaceAndFingerprintEnroll();		launchFaceAndFingerprintEnroll();
	} else {		} else {
	setOrConfirmCredentialsNow();		setOrConfirmCredentialsNow();

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
	protected void onActivityResult(int requestCode, int resultCode, Intent data) {		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
	super.onActivityResult(requestCode, resultCode, data);		super.onActivityResult(requestCode, resultCode, data);
	mResultIntent = data;		mResultIntent = data;
	if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST		if (resultCode == RESULT_TIMEOUT) {
			setResult(resultCode, data);
			finish();
			} else if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
	\|\| requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {		\|\| requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
	// If the user finished or skipped enrollment, finish this activity		// If the user finished or skipped enrollment, finish this activity
	if (resultCode == RESULT_SKIP \|\| resultCode == RESULT_FINISHED		if (resultCode == RESULT_SKIP \|\| resultCode == RESULT_FINISHED
	@@ -234,9 +237,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
	setResult(resultCode, data);		setResult(resultCode, data);
	finish();		finish();
	}		}
	} else if (resultCode == RESULT_TIMEOUT) {
	setResult(resultCode, data);
	finish();
	}		}
	}		}

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -90,16 +90,15 @@ public class SubscriptionAnnotation {

	mOrderWithinList = subInfoIndex;		mOrderWithinList = subInfoIndex;
	mType = mSubInfo.isEmbedded() ? TYPE_ESIM : TYPE_PSIM;		mType = mSubInfo.isEmbedded() ? TYPE_ESIM : TYPE_PSIM;
			mIsExisted = true;
	if (mType == TYPE_ESIM) {		if (mType == TYPE_ESIM) {
	int cardId = mSubInfo.getCardId();		int cardId = mSubInfo.getCardId();
	mIsExisted = eSimCardId.contains(cardId);
	mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());		mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
	mIsAllowToDisplay = (cardId < 0) // always allow when eSIM not in slot		mIsAllowToDisplay = (cardId < 0) // always allow when eSIM not in slot
	\|\| isDisplayAllowed(context);		\|\| isDisplayAllowed(context);
	return;		return;
	}		}

	mIsExisted = true;
	mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)		mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)
	&& activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());		&& activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
	mIsAllowToDisplay = isDisplayAllowed(context);		mIsAllowToDisplay = isDisplayAllowed(context);