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

Commit 6a042587 authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Don't enable Bluetooth when booting into airplane mode."

parents 3111a317 aa6bd940

services/java/com/android/server/SystemServer.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -209,9 +209,11 @@ class ServerThread extends Thread { 
                                          bluetoothA2dp);

                                          bluetoothA2dp);

                bluetooth.initAfterA2dpRegistration();

                bluetooth.initAfterA2dpRegistration();





                int airplaneModeOn = Settings.System.getInt(mContentResolver,

                        Settings.System.AIRPLANE_MODE_ON, 0);

                int bluetoothOn = Settings.Secure.getInt(mContentResolver,

                int bluetoothOn = Settings.Secure.getInt(mContentResolver,

                    Settings.Secure.BLUETOOTH_ON, 0);

                    Settings.Secure.BLUETOOTH_ON, 0);

                if (bluetoothOn > 0) {

                if (airplaneModeOn == 0 && bluetoothOn != 0) {

                    bluetooth.enable();

                    bluetooth.enable();

                }

                }

            }

            }