Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78aac

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15560908

Change-Id: Ie9a2f8d2a24007b48021f967a4b52fb773d4882f
This commit is contained in:
Evan Chen
2021-09-07 20:47:41 +00:00
committed by Automerger Merge Worker
parent ff5100d3b3 535de78aac
commit 4fb8247886
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
View File

@@ -93,9 +93,9 @@ public class CompanionDeviceActivity extends Activity {
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0); final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
setTitle(Html.fromHtml(getString( setTitle(Html.fromHtml(getString(
R.string.confirmation_title, R.string.confirmation_title,
getCallingAppName(), Html.escapeHtml(getCallingAppName()),
profileName, Html.escapeHtml(selectedDevice.getDisplayName())), 0));
selectedDevice.getDisplayName()), 0));
mPairButton = findViewById(R.id.button_pair); mPairButton = findViewById(R.id.button_pair);
mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice)); mPairButton.setOnClickListener(v -> onDeviceConfirmed(getService().mSelectedDevice));
getService().mSelectedDevice = selectedDevice; getService().mSelectedDevice = selectedDevice;
@@ -108,8 +108,8 @@ public class CompanionDeviceActivity extends Activity {
mPairButton = findViewById(R.id.button_pair); mPairButton = findViewById(R.id.button_pair);
mPairButton.setVisibility(View.GONE); mPairButton.setVisibility(View.GONE);
setTitle(Html.fromHtml(getString(R.string.chooser_title, setTitle(Html.fromHtml(getString(R.string.chooser_title,
profileName, Html.escapeHtml(profileName),
getCallingAppName()), 0)); Html.escapeHtml(getCallingAppName())), 0));
mDeviceListView = findViewById(R.id.device_list); mDeviceListView = findViewById(R.id.device_list);
mDevicesAdapter = new DevicesAdapter(); mDevicesAdapter = new DevicesAdapter();
mDeviceListView.setAdapter(mDevicesAdapter); mDeviceListView.setAdapter(mDevicesAdapter);