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

Commit eddbc8a3 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "PairDevice to structured Parcelable." am: f7ff6638 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
parents f5876a1d f7ff6638

src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class AdbDeviceDetailsFingerprintController extends AbstractPreferenceCon 
        final CharSequence titleFormat = mContext.getText(

                R.string.adb_device_fingerprint_title_format);

        mFingerprintPref.setTitle(String.format(

                titleFormat.toString(), mPairedDevice.getGuid()));

                titleFormat.toString(), mPairedDevice.guid));

        mFingerprintCategory.addPreference(mFingerprintPref);

    }

}

src/com/android/settings/development/AdbDeviceDetailsHeaderController.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class AdbDeviceDetailsHeaderController extends AbstractPreferenceControll 


        mEntityHeaderController

                .setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))

                .setLabel(mPairedDevice.getDeviceName())

                .setLabel(mPairedDevice.name)

                .done(mFragment.getActivity(), true);

    }

}

src/com/android/settings/development/AdbPairedDevicePreference.java

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ public class AdbPairedDevicePreference extends Preference { 


    static void setTitle(AdbPairedDevicePreference preference,

                         PairDevice pairedDevice) {

        preference.setTitle(pairedDevice.getDeviceName());

        preference.setSummary(pairedDevice.isConnected()

        preference.setTitle(pairedDevice.name);

        preference.setSummary(pairedDevice.connected

                ? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)

                : "");

    }

src/com/android/settings/development/WirelessDebuggingFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ public class WirelessDebuggingFragment extends DashboardFragment 
            case FORGET_ACTION:

                try {

                    p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);

                    mAdbManager.unpairDevice(p.getGuid());

                    mAdbManager.unpairDevice(p.guid);

                } catch (RemoteException e) {

                    Log.e(TAG, "Unable to forget the device");

                }