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

Commit bb33bdce authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Save changed name from CachedBluetoothDevice to native storage"

parents fd070b4b 2036ebd8

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public final class BluetoothPairingRequest extends BroadcastReceiver { 


                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);

                if (TextUtils.isEmpty(name)) {

                    name = device != null ? device.getName() :

                    name = device != null ? device.getAliasName() :

                            context.getString(android.R.string.unknownName);

                }

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

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
    }



    private String createConnectionDisplayText() {

        String mRemoteName = mDevice != null ? mDevice.getName() : null;

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



        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);

        String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
@@ -139,7 +139,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
    }



    private String createPbapDisplayText() {

        String mRemoteName = mDevice != null ? mDevice.getName() : null;

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



        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);

        String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text,

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
                Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,

                    context.getString(R.string.bluetooth_connection_permission_request),

                    System.currentTimeMillis());

                String deviceName = device != null ? device.getName() : null;

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

                notification.setLatestEventInfo(context,

                    context.getString(R.string.bluetooth_connection_permission_request),

                    context.getString(R.string.bluetooth_connection_notif_message, deviceName),

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

+3 −3
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> { 
                mName = mDevice.getAddress();

            } else {

                mName = name;

                mDevice.setAlias(name);

            }

            // TODO: save custom device name in preferences

            dispatchAttributesChanged();

        }

    }
@@ -338,7 +338,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> { 
    }



    private void fetchName() {

        mName = mDevice.getName();

        mName = mDevice.getAliasName();



        if (TextUtils.isEmpty(mName)) {

            mName = mDevice.getAddress();
@@ -422,7 +422,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> { 
        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);



        if (DEBUG) {

            Log.e(TAG, "updating profiles for " + mDevice.getName());

            Log.e(TAG, "updating profiles for " + mDevice.getAliasName());

            BluetoothClass bluetoothClass = mDevice.getBluetoothClass();



            if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ final class CachedBluetoothDeviceManager { 
            return cachedDevice.getName();

        }



        String name = device.getName();

        String name = device.getAliasName();

        if (name != null) {

            return name;

        }