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

Commit 8ac578e4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker Committed by Anis Assi
Browse files

Merge cherrypicks of [15800877, 15799943, 15800878, 15799944, 15800879,... 

Merge cherrypicks of [15800877, 15799943, 15800878, 15799944, 15800879, 15800987, 15800365, 15799765] into security-aosp-pi-release

Change-Id: If13bed92167e933c947ad98410bd3b0f178f5341
parents 477d208d 0ec16186

core/java/android/bluetooth/BluetoothDevice.java

+8 −1
Original line number Diff line number Diff line
@@ -894,7 +894,14 @@ public final class BluetoothDevice implements Parcelable { 
            return null;

        }

        try {

            return service.getRemoteAlias(this);

            String alias = service.getRemoteAlias(this);

            if (alias == null) {

                return getName();

            }

            return alias

                    .replace('\t', ' ')

                    .replace('\n', ' ')

                    .replace('\r', ' ');

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

core/java/android/hardware/camera2/params/OutputConfiguration.java

+1 −7
Original line number Diff line number Diff line
@@ -630,13 +630,7 @@ public final class OutputConfiguration implements Parcelable { 
            new Parcelable.Creator<OutputConfiguration>() {

        @Override

        public OutputConfiguration createFromParcel(Parcel source) {

            try {

                OutputConfiguration outputConfiguration = new OutputConfiguration(source);

                return outputConfiguration;

            } catch (Exception e) {

                Log.e(TAG, "Exception creating OutputConfiguration from parcel", e);

                return null;

            }

            return new OutputConfiguration(source);

        }



        @Override

core/java/android/hardware/camera2/params/VendorTagDescriptor.java

+1 −7
Original line number Diff line number Diff line
@@ -36,13 +36,7 @@ public final class VendorTagDescriptor implements Parcelable { 
            new Parcelable.Creator<VendorTagDescriptor>() {

        @Override

        public VendorTagDescriptor createFromParcel(Parcel source) {

            try {

                VendorTagDescriptor vendorDescriptor = new VendorTagDescriptor(source);

                return vendorDescriptor;

            } catch (Exception e) {

                Log.e(TAG, "Exception creating VendorTagDescriptor from parcel", e);

                return null;

            }

            return new VendorTagDescriptor(source);

        }



        @Override

core/java/android/hardware/camera2/params/VendorTagDescriptorCache.java

+1 −7
Original line number Diff line number Diff line
@@ -36,13 +36,7 @@ public final class VendorTagDescriptorCache implements Parcelable { 
            new Parcelable.Creator<VendorTagDescriptorCache>() {

        @Override

        public VendorTagDescriptorCache createFromParcel(Parcel source) {

            try {

                VendorTagDescriptorCache vendorDescriptorCache = new VendorTagDescriptorCache(source);

                return vendorDescriptorCache;

            } catch (Exception e) {

                Log.e(TAG, "Exception creating VendorTagDescriptorCache from parcel", e);

                return null;

            }

            return new VendorTagDescriptorCache(source);

        }



        @Override

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

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