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

Commit d9b78ebc authored by tom hsu's avatar tom hsu Committed by Tom Hsu
Browse files

Fix crash due to over limited length. 

Flag: EXEMPT bug fix
Fix: b/388404115
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a66f9dc3629586c3543952566f05f1b720dfa50c)
Merged-In: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
Change-Id: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
parent 85107f0f

res/layout/dialog_mobile_network_rename.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                android:layout_height="wrap_content"

                android:inputType="text"

                android:paddingTop="@dimen/sim_label_padding"

                android:maxLength="50"

                android:maxLength="@integer/sim_label_max_length"

                android:singleLine="true"/>



            <TextView

res/values/integers.xml

+2 −0
Original line number Diff line number Diff line
@@ -42,4 +42,6 @@ 
    <integer name="pointer_scale_seek_bar_end">3</integer>



    <integer name="max_integer">2147483647</integer>



    <integer name="sim_label_max_length">50</integer>

</resources>

src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java

+7 −7
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        }

        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                info, getContext());

        mNameView.setText(displayName);

        if (!TextUtils.isEmpty(displayName)) {

            mNameView.setSelection(displayName.length());

            mNameView.setSelection(Math.min(displayName.length(),

                    getResources().getInteger(R.integer.sim_label_max_length)));

        }



        mColorSpinner = view.findViewById(R.id.color_spinner);