Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7175f1fd authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

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

Merge "Fix Security issue for Html.fromHtml without escape" into sc-v2-dev am: a7292658 am: cdee5022

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

Change-Id: I780117f1d67e9d4a71f7ae2f5dfa59b6d8ead328
parents 38ac8d6e cdee5022

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -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);