Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edeefdbf authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9195661 from 062b18c7 to tm-qpr2-release

Change-Id: I596f85339f888ea43a6dea6be127197299661b06
parents 2ae91632 062b18c7
Loading
Loading
Loading
Loading
+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);
        }
    }
}