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

Commit 59dd0f9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify whether or not the disconnected string should be used" into... 

Merge "Specify whether or not the disconnected string should be used" into tm-dev am: 01f7e54f am: f24018a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17388861



Change-Id: Ie2cb456cc5cf52840d7eb3a8f0e9fdd7c9b9c5df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8022fd8e f24018a0

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

+15 −6
Original line number Diff line number Diff line
@@ -1157,18 +1157,26 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    }



    /**

     * See {@link #getCarConnectionSummary(boolean)}

     * See {@link #getCarConnectionSummary(boolean, boolean)}

     */

    public String getCarConnectionSummary() {

        return getCarConnectionSummary(false);

        return getCarConnectionSummary(false /* shortSummary */);

    }



    /**

     * See {@link #getCarConnectionSummary(boolean, boolean)}

     */

    public String getCarConnectionSummary(boolean shortSummary) {

        return getCarConnectionSummary(shortSummary, true /* useDisconnectedString */);

    }



    /**

     * Returns android auto string that describes the connection state of this device.

     *

     * @param shortSummary {@code true} if need to return short version summary

     * @param useDisconnectedString {@code true} if need to return disconnected summary string

     */

    public String getCarConnectionSummary(boolean shortSummary) {

    public String getCarConnectionSummary(boolean shortSummary, boolean useDisconnectedString) {

        boolean profileConnected = false;       // at least one profile is connected

        boolean a2dpNotConnected = false;       // A2DP is preferred but not connected

        boolean hfpNotConnected = false;        // HFP is preferred but not connected
@@ -1286,9 +1294,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
            }

        }



        return getBondState() == BluetoothDevice.BOND_BONDING ?

                mContext.getString(R.string.bluetooth_pairing) :

                mContext.getString(R.string.bluetooth_disconnected);

        if (getBondState() == BluetoothDevice.BOND_BONDING) {

            return mContext.getString(R.string.bluetooth_pairing);

        }

        return useDisconnectedString ? mContext.getString(R.string.bluetooth_disconnected) : null;

    }



    /**