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

Commit eed0f881 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Refactor usages of getAliasName to use getAlias in Settings"

parents 9d298334 c96469f2

src/com/android/settings/bluetooth/BluetoothPairingService.java

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public final class BluetoothPairingService extends Service { 
        String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);

        if (TextUtils.isEmpty(name)) {

            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

            name = device != null ? device.getAliasName() : res.getString(android.R.string.unknownName);

            name = device != null ? device.getAlias() : res.getString(android.R.string.unknownName);

        }



        Log.d(TAG, "Show pairing notification for " + mDevice.getAddress() + " (" + name + ")");

src/com/android/settings/bluetooth/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public final class Utils { 
    }



    public static String createRemoteName(Context context, BluetoothDevice device) {

        String mRemoteName = device != null ? device.getAliasName() : null;

        String mRemoteName = device != null ? device.getAlias() : null;



        if (mRemoteName == null) {

            mRemoteName = context.getString(R.string.unknown);

src/com/android/settings/media/MediaOutputIndicatorSlice.java

+2 −2
Original line number Diff line number Diff line
@@ -149,14 +149,14 @@ public class MediaOutputIndicatorSlice implements CustomSliceable { 
        // Return Hearing Aid device name if it is active

        BluetoothDevice activeDevice = findActiveHearingAidDevice();

        if (activeDevice != null) {

            return activeDevice.getAliasName();

            return activeDevice.getAlias();

        }

        // Return A2DP device name if it is active

        final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();

        if (a2dpProfile != null) {

            activeDevice = a2dpProfile.getActiveDevice();

            if (activeDevice != null) {

                return activeDevice.getAliasName();

                return activeDevice.getAlias();

            }

        }

        // No active device, return default summary

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class HandsFreeProfileOutputPreferenceController extends AudioSwitchPrefe 
            final BluetoothDevice btDevice = mConnectedDevices.get(connectedDeviceIndex);

            mSelectedIndex = connectedDeviceIndex;

            setActiveBluetoothDevice(btDevice);

            listPreference.setSummary(btDevice.getAliasName());

            listPreference.setSummary(btDevice.getAlias());

        }

        return true;

    }
@@ -143,7 +143,7 @@ public class HandsFreeProfileOutputPreferenceController extends AudioSwitchPrefe 
        mediaValues[mSelectedIndex] = defaultSummary;

        for (int i = 0, size = mConnectedDevices.size(); i < size; i++) {

            final BluetoothDevice btDevice = mConnectedDevices.get(i);

            mediaOutputs[i] = btDevice.getAliasName();

            mediaOutputs[i] = btDevice.getAlias();

            mediaValues[i] = btDevice.getAddress();

            if (btDevice.equals(activeDevice)) {

                // select the active connected device.

src/com/android/settings/sound/MediaOutputPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro 
        mPreference.setVisible(deviceConnected);

        mPreference.setSummary((activeDevice == null) ?

                mContext.getText(R.string.media_output_default_summary) :

                activeDevice.getAliasName());

                activeDevice.getAlias());

    }



    @Override