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

Commit 739f7ac3 authored by Wileen Chiu's avatar Wileen Chiu Committed by Gerrit - the friendly Code Review server
Browse files

SystemUI: Provide correct resource type 

- The value stored for when the network
class is unknown is 0. We attempt to get
the resource for this value, which doesn't exist,
resulting in a crash
- Store an empty string for when the
network class is unknown, which is also the
default value.

Change-Id: I1c10dfe18b7dd78e798c2b5a89ca2974136b7e84
CRs-Fixed: 953821
parent 568a34f8

core/res/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -2427,6 +2427,7 @@ 
    <bool name="config_display_rat">false</bool>



    <!-- config 2G/3G/4G RAT strings for carriers -->

    <string name="config_rat_unknown" translatable="false">""</string>

    <string name="config_rat_2g" translatable="false">2G</string>

    <string name="config_rat_3g" translatable="false">3G</string>

    <string name="config_rat_4g" translatable="false">4G</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2407,6 +2407,7 @@ 
  <java-symbol type="string" name="def_wifi_direct_name" />

  <java-symbol type="string" name="def_custom_bt_defname" />

  <!-- config 2G/3G/4G RAT strings for carriers -->

  <java-symbol type="string" name="config_rat_unknown" />

  <java-symbol type="string" name="config_rat_2g" />

  <java-symbol type="string" name="config_rat_3g" />

  <java-symbol type="string" name="config_rat_4g" />

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+2 −1
Original line number Diff line number Diff line
@@ -448,7 +448,8 @@ public class CarrierText extends TextView { 
    }



    private String networkClassToString (int networkClass) {

        final int[] classIds = { 0, // TelephonyManager.NETWORK_CLASS_UNKNOWN

        final int[] classIds =

            {com.android.internal.R.string.config_rat_unknown, // TelephonyManager.NETWORK_CLASS_UNKNOWN

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_4g };

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+2 −1
Original line number Diff line number Diff line
@@ -384,7 +384,8 @@ public class MobileSignalController extends SignalController< 
    }



    private String networkClassToString (int networkClass) {

        final int[] classIds = { 0, // TelephonyManager.NETWORK_CLASS_UNKNOWN

        final int[] classIds =

            {com.android.internal.R.string.config_rat_unknown, // TelephonyManager.NETWORK_CLASS_UNKNOWN

            com.android.internal.R.string.config_rat_2g,

            com.android.internal.R.string.config_rat_3g,

            com.android.internal.R.string.config_rat_4g };