Snap for 9195661 from 062b18c7365577937ea33cae445026214fb0a01a to tm-qpr2-release (edeefdbf) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,11 @@ public class Settings extends SettingsActivity {
		/** Redirects to SafetyCenter if enabled. */
		@VisibleForTesting
		public void handleSafetyCenterRedirection() {
		if (isFinishing()) {
		// Don't trampoline if already exiting this activity.
		return;
		}

		if (SafetyCenterManagerWrapper.get().isEnabled(this)) {
		try {
		startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));
		@@ -213,6 +218,11 @@ public class Settings extends SettingsActivity {
		/** Redirects to SafetyCenter if enabled. */
		@VisibleForTesting
		public void handleSafetyCenterRedirection() {
		if (isFinishing()) {
		// Don't trampoline if already exiting this activity.
		return;
		}

		if (ACTION_PRIVACY_SETTINGS.equals(getIntent().getAction())
		&& SafetyCenterManagerWrapper.get().isEnabled(this)) {
		try {

+1 −3

Original line number	Diff line number	Diff line
		@@ -87,9 +87,7 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
		return;
		}

		if (mBluetoothManager.getCachedDeviceManager().shouldPairByCsip(device, groupId)) {
		device.createBond(BluetoothDevice.TRANSPORT_LE);
		}
		mBluetoothManager.getCachedDeviceManager().pairDeviceByCsip(device, groupId);
		}
		}
		}