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

Commit 79a83b7e authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Don't remove map&pbap toggle in device details UI" into main

parents c28dfa68 7127db19

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+8 −4
Original line number Diff line number Diff line
@@ -708,15 +708,19 @@ public class LocalBluetoothProfileManager { 
            removedProfiles.remove(mPanProfile);

        }



        if ((mMapProfile != null) &&

            (mMapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) {

        if ((mMapProfile != null

                        && mMapProfile.getConnectionStatus(device)

                                == BluetoothProfile.STATE_CONNECTED)

                || removedProfiles.contains(mMapProfile)) {

            profiles.add(mMapProfile);

            removedProfiles.remove(mMapProfile);

            mMapProfile.setEnabled(device, true);

        }



        if ((mPbapProfile != null) &&

            (mPbapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) {

        if ((mPbapProfile != null

                        && mPbapProfile.getConnectionStatus(device)

                                == BluetoothProfile.STATE_CONNECTED)

                || removedProfiles.contains(mPbapProfile)) {

            profiles.add(mPbapProfile);

            removedProfiles.remove(mPbapProfile);

            mPbapProfile.setEnabled(device, true);