diff options
| author | Evan Chen <evanxinchen@google.com> | 2021-09-06 05:03:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-06 05:03:16 +0000 |
| commit | 37d7f20996be30118dc192562725da2af9cac72b (patch) | |
| tree | a0338071f217e9974ae1f2671b381618fcffafc9 | |
| parent | 662fcc58ef289bd7231f146ae86b8c749d46f2dc (diff) | |
| parent | 587162dfb8bdce872b5b072e28fe97eafc98d110 (diff) | |
| download | base-37d7f20996be30118dc192562725da2af9cac72b.tar.gz | |
Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744060
Change-Id: I3b0f3bdeff33c52b5b20f4b6db10f5069d9bfbb6
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java index 7bc9993751d4..bca667db0ab7 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java @@ -64,8 +64,8 @@ public class DeviceChooserActivity extends Activity { final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0); setTitle(Html.fromHtml(getString( R.string.confirmation_title, - getCallingAppName(), - selectedDevice.getDisplayName()), 0)); + Html.escapeHtml(getCallingAppName()), + Html.escapeHtml(selectedDevice.getDisplayName())), 0)); mPairButton = findViewById(R.id.button_pair); mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice)); getService().mSelectedDevice = selectedDevice; @@ -74,7 +74,8 @@ public class DeviceChooserActivity extends Activity { setContentView(R.layout.device_chooser); mPairButton = findViewById(R.id.button_pair); mPairButton.setVisibility(View.GONE); - setTitle(Html.fromHtml(getString(R.string.chooser_title, getCallingAppName()), 0)); + setTitle(Html.fromHtml(getString(R.string.chooser_title, + Html.escapeHtml(getCallingAppName())), 0)); mDeviceListView = findViewById(R.id.device_list); final DeviceDiscoveryService.DevicesAdapter adapter = getService().mDevicesAdapter; mDeviceListView.setAdapter(adapter); |