Commit e2028a77 authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS Tether] Change "supportsArcPlusPlus" field name.

The field was erroneously named. The field's meaning actually indicates
whether enrollment was done through ARC++. It is possible to have
multiple enrollments of a single device: one through native CrOS and
one through ARC++.

The new name is "isArcPlusPlusEnrollment".

Bug: 778026, 672263
Change-Id: I0be749e32e1569602efa30c5a9df768d7a45d15c
Reviewed-on: https://chromium-review.googlesource.com/811830Reviewed-by: default avatarJeremy Klein <jlklein@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522273}
parent 1197c34e
...@@ -74,7 +74,7 @@ const char kExternalDeviceFriendlyName[] = "friendlyDeviceName"; ...@@ -74,7 +74,7 @@ const char kExternalDeviceFriendlyName[] = "friendlyDeviceName";
const char kExternalDeviceBluetoothAddress[] = "bluetoothAddress"; const char kExternalDeviceBluetoothAddress[] = "bluetoothAddress";
const char kExternalDeviceUnlockKey[] = "unlockKey"; const char kExternalDeviceUnlockKey[] = "unlockKey";
const char kExternalDeviceMobileHotspot[] = "hasMobileHotspot"; const char kExternalDeviceMobileHotspot[] = "hasMobileHotspot";
const char kExternalDeviceSupportsArcPlusPlus[] = "supportsArcPlusPlus"; const char kExternalDeviceIsArcPlusPlusEnrollment[] = "isArcPlusPlusEnrollment";
const char kExternalDeviceIsPixelPhone[] = "isPixelPhone"; const char kExternalDeviceIsPixelPhone[] = "isPixelPhone";
const char kExternalDeviceConnectionStatus[] = "connectionStatus"; const char kExternalDeviceConnectionStatus[] = "connectionStatus";
const char kExternalDeviceRemoteState[] = "remoteState"; const char kExternalDeviceRemoteState[] = "remoteState";
...@@ -533,7 +533,7 @@ ProximityAuthWebUIHandler::ExternalDeviceInfoToDictionary( ...@@ -533,7 +533,7 @@ ProximityAuthWebUIHandler::ExternalDeviceInfoToDictionary(
dictionary->SetBoolean(kExternalDeviceUnlockKey, device_info.unlock_key()); dictionary->SetBoolean(kExternalDeviceUnlockKey, device_info.unlock_key());
dictionary->SetBoolean(kExternalDeviceMobileHotspot, dictionary->SetBoolean(kExternalDeviceMobileHotspot,
device_info.mobile_hotspot_supported()); device_info.mobile_hotspot_supported());
dictionary->SetBoolean(kExternalDeviceSupportsArcPlusPlus, dictionary->SetBoolean(kExternalDeviceIsArcPlusPlusEnrollment,
device_info.arc_plus_plus()); device_info.arc_plus_plus());
dictionary->SetBoolean(kExternalDeviceIsPixelPhone, dictionary->SetBoolean(kExternalDeviceIsPixelPhone,
device_info.pixel_phone()); device_info.pixel_phone());
......
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
<td class='supports-mobile-hotspot'></td> <td class='supports-mobile-hotspot'></td>
</tr> </tr>
<tr> <tr>
<td>Supports ARC++</td> <td>Is ARC++ Enrollment</td>
<td class='supports-arc-plus-plus'></td> <td class='is-arc-plus-plus-enrollment'></td>
</tr> </tr>
<tr> <tr>
<td>Is Pixel Phone</td> <td>Is Pixel Phone</td>
......
...@@ -175,7 +175,7 @@ class DeviceListController { ...@@ -175,7 +175,7 @@ class DeviceListController {
createRemoteDeviceItem_(remoteDevice) { createRemoteDeviceItem_(remoteDevice) {
var isUnlockKey = !!remoteDevice['unlockKey']; var isUnlockKey = !!remoteDevice['unlockKey'];
var hasMobileHotspot = !!remoteDevice['hasMobileHotspot']; var hasMobileHotspot = !!remoteDevice['hasMobileHotspot'];
var supportsArcPlusPlus = !!remoteDevice['supportsArcPlusPlus']; var isArcPlusPlusEnrollment = !!remoteDevice['isArcPlusPlusEnrollment'];
var isPixelPhone = !!remoteDevice['isPixelPhone']; var isPixelPhone = !!remoteDevice['isPixelPhone'];
var t = this.remoteDeviceTemplate_.content; var t = this.remoteDeviceTemplate_.content;
...@@ -187,8 +187,8 @@ class DeviceListController { ...@@ -187,8 +187,8 @@ class DeviceListController {
remoteDevice['publicKeyTruncated']; remoteDevice['publicKeyTruncated'];
t.querySelector('.is-unlock-key').textContent = isUnlockKey; t.querySelector('.is-unlock-key').textContent = isUnlockKey;
t.querySelector('.supports-mobile-hotspot').textContent = hasMobileHotspot; t.querySelector('.supports-mobile-hotspot').textContent = hasMobileHotspot;
t.querySelector('.supports-arc-plus-plus').textContent = t.querySelector('.is-arc-plus-plus-enrollment').textContent =
supportsArcPlusPlus; isArcPlusPlusEnrollment;
t.querySelector('.is-pixel-phone').textContent = isPixelPhone; t.querySelector('.is-pixel-phone').textContent = isPixelPhone;
if (!!remoteDevice['bluetoothAddress']) { if (!!remoteDevice['bluetoothAddress']) {
t.querySelector('.bluetooth-address-row').classList.remove('hidden'); t.querySelector('.bluetooth-address-row').classList.remove('hidden');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment