From d61750990ddbd0530ddb8b9221e46cab54a9f36d Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 27 Jul 2021 14:53:45 -0700 Subject: [PATCH] PairDevice to structured Parcelable. Bug: 194829333 Test: pass Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd --- .../development/AdbDeviceDetailsFingerprintController.java | 2 +- .../development/AdbDeviceDetailsHeaderController.java | 2 +- .../settings/development/AdbPairedDevicePreference.java | 4 ++-- .../settings/development/WirelessDebuggingFragment.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java index b9c2d4315cb..3aa92f1f9aa 100644 --- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java +++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java @@ -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); } } diff --git a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java index a4e79eac8be..7830bb978ae 100644 --- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java +++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java @@ -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); } } diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java index a82a949ad01..5d30428709e 100644 --- a/src/com/android/settings/development/AdbPairedDevicePreference.java +++ b/src/com/android/settings/development/AdbPairedDevicePreference.java @@ -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) : ""); } diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java index 68d25e18cf9..003462f9f93 100644 --- a/src/com/android/settings/development/WirelessDebuggingFragment.java +++ b/src/com/android/settings/development/WirelessDebuggingFragment.java @@ -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"); }