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

Commit 0199e97e authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 75ee6b8f de35de9e

core/java/android/bluetooth/BluetoothDevice.java

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

            return null;

        }

        }

        try {

        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) {

        } catch (RemoteException e) {

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

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

        }

        }

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

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

            new Parcelable.Creator<OutputConfiguration>() {

        @Override

        @Override

        public OutputConfiguration createFromParcel(Parcel source) {

        public OutputConfiguration createFromParcel(Parcel source) {

            try {

            return new OutputConfiguration(source);

                OutputConfiguration outputConfiguration = new OutputConfiguration(source);

                return outputConfiguration;

            } catch (Exception e) {

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

                return null;

            }

        }

        }





        @Override

        @Override

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

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

            new Parcelable.Creator<VendorTagDescriptor>() {

        @Override

        @Override

        public VendorTagDescriptor createFromParcel(Parcel source) {

        public VendorTagDescriptor createFromParcel(Parcel source) {

            try {

            return new VendorTagDescriptor(source);

                VendorTagDescriptor vendorDescriptor = new VendorTagDescriptor(source);

                return vendorDescriptor;

            } catch (Exception e) {

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

                return null;

            }

        }

        }





        @Override

        @Override

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

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

            new Parcelable.Creator<VendorTagDescriptorCache>() {

        @Override

        @Override

        public VendorTagDescriptorCache createFromParcel(Parcel source) {

        public VendorTagDescriptorCache createFromParcel(Parcel source) {

            try {

            return new VendorTagDescriptorCache(source);

                VendorTagDescriptorCache vendorDescriptorCache = new VendorTagDescriptorCache(source);

                return vendorDescriptorCache;

            } catch (Exception e) {

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

                return null;

            }

        }

        }





        @Override

        @Override

core/res/res/values-af/strings.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1267,6 +1267,7 @@ 
    <string name="deny" msgid="2081879885755434506">"Weier"</string>

    <string name="deny" msgid="2081879885755434506">"Weier"</string>

    <string name="permission_request_notification_title" msgid="6486759795926237907">"Toestemming versoek"</string>

    <string name="permission_request_notification_title" msgid="6486759795926237907">"Toestemming versoek"</string>

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Toestemming versoek\nvir rekening <xliff:g id="ACCOUNT">%s</xliff:g>."</string>

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Toestemming versoek\nvir rekening <xliff:g id="ACCOUNT">%s</xliff:g>."</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"Toestemming versoek deur <xliff:g id="APP">%1$s</xliff:g>\nvir rekening <xliff:g id="ACCOUNT">%2$s</xliff:g>"</string>

    <string name="forward_intent_to_owner" msgid="1207197447013960896">"Jy gebruik hierdie program buite jou werkprofiel"</string>

    <string name="forward_intent_to_owner" msgid="1207197447013960896">"Jy gebruik hierdie program buite jou werkprofiel"</string>

    <string name="forward_intent_to_work" msgid="621480743856004612">"Jy gebruik tans hierdie program in jou werkprofiel"</string>

    <string name="forward_intent_to_work" msgid="621480743856004612">"Jy gebruik tans hierdie program in jou werkprofiel"</string>

    <string name="input_method_binding_label" msgid="1283557179944992649">"Invoermetode"</string>

    <string name="input_method_binding_label" msgid="1283557179944992649">"Invoermetode"</string>