Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I2c334127de069f834cf4d955ac18cf0df4ed5f83
diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
index b9c2d43..3aa92f1 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
@@ -73,7 +73,7 @@
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 a4e79ea..7830bb9 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -81,7 +81,7 @@
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 a82a949..5d30428 100644
--- a/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -77,8 +77,8 @@
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 47d4e52..46fca98 100644
--- a/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -434,7 +434,7 @@
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");
}