Skip to content

Commit 42f9dee

Browse files
Evan Chenanisassigoogle
authored andcommitted
Backporting the change of ag/15629060 to rvc-dev
Bug: 172251622 Bug: 197035186 Change-Id: Ic3ffcb622af232473adf8a8c8307cce78227bac0 Merged-In: I7e2f95fd85e18127dc481f188ace8ad6effc4831 Test: Manual (cherry picked from commit 7f687d49115016a992f86c4167222804348dc2d5)
1 parent 6c6a7f6 commit 42f9dee

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public void onCreate(Bundle savedInstanceState) {
6464
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
6565
setTitle(Html.fromHtml(getString(
6666
R.string.confirmation_title,
67-
getCallingAppName(),
68-
selectedDevice.getDisplayName()), 0));
67+
Html.escapeHtml(getCallingAppName()),
68+
Html.escapeHtml(selectedDevice.getDisplayName())), 0));
6969
mPairButton = findViewById(R.id.button_pair);
7070
mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));
7171
getService().mSelectedDevice = selectedDevice;
@@ -74,7 +74,8 @@ public void onCreate(Bundle savedInstanceState) {
7474
setContentView(R.layout.device_chooser);
7575
mPairButton = findViewById(R.id.button_pair);
7676
mPairButton.setVisibility(View.GONE);
77-
setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0));
77+
setTitle(Html.fromHtml(getString(R.string.chooser_title,
78+
Html.escapeHtml(getCallingAppName())), 0));
7879
mDeviceListView = findViewById(R.id.device_list);
7980
final DeviceDiscoveryService.DevicesAdapter adapter = getService().mDevicesAdapter;
8081
mDeviceListView.setAdapter(adapter);

0 commit comments

Comments
 (0)