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

Commit 5f0a5eb8 authored by Andy Wickham's avatar Andy Wickham
Browse files

Utilities.trim never returns null. 

This fixes a crash loop I was seeing on my device and also
preemptively fixes similar NullPointerExceptions.

Bug: 213931730
Test: Manually verified crash loop stopped with this change.
Change-Id: I8d2fc8475d42ac60b7fdc9219421a8c9733c7b9f
(cherry picked from commit 56be73be)
parent fea22ae7

src/com/android/launcher3/BubbleTextView.java

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.graphics.drawable.ColorDrawable; 
import android.graphics.drawable.Drawable;

import android.icu.text.MessageFormat;

import android.text.TextPaint;

import android.text.TextUtils;

import android.text.TextUtils.TruncateAt;

import android.util.AttributeSet;

import android.util.Property;
@@ -785,7 +786,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
                    invalidate();

                }

            }

            if (itemInfo.contentDescription != null) {

            if (!TextUtils.isEmpty(itemInfo.contentDescription)) {

                if (itemInfo.isDisabled()) {

                    setContentDescription(getContext().getString(R.string.disabled_app_label,

                            itemInfo.contentDescription));

src/com/android/launcher3/Utilities.java

+2 −1
Original line number Diff line number Diff line
@@ -460,9 +460,10 @@ public final class Utilities { 
     * Trims the string, removing all whitespace at the beginning and end of the string.

     * Non-breaking whitespaces are also removed.

     */

    @NonNull

    public static String trim(CharSequence s) {

        if (s == null) {

            return null;

            return "";

        }



        // Just strip any sequence of whitespace or java space characters from the beginning and end

src/com/android/launcher3/model/LoaderCursor.java

+1 −2
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ public class LoaderCursor extends CursorWrapper { 
     * Returns the title or empty string

     */

    private String getTitle() {

        String title = getString(titleIndex);

        return TextUtils.isEmpty(title) ? "" : Utilities.trim(title);

        return Utilities.trim(getString(titleIndex));

    }



    /**