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

Commit c713bf79 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Fix boot loop when deriving device name." into lmp-dev

parents 61642ce8 ad59c430

packages/SettingsProvider/res/values/defaults.xml

+4 −4
Original line number Diff line number Diff line
@@ -193,11 +193,11 @@ 
    <!-- Default for Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, 1==on -->

    <integer name="def_heads_up_enabled">1</integer>



    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->

    <string name="def_device_name">%1$s</string>



    <!-- Default for Settings.Global.DEVICE_NAME $1=MANUFACTURER $2=MODEL-->

    <string name="def_device_name_old">%1$s %2$s</string>

    <string name="def_device_name">%1$s %2$s</string>



    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->

    <string name="def_device_name_simple">%1$s</string>



    <!-- Default for Settings.Secure.WAKE_GESTURE_ENABLED -->

    <bool name="def_wake_gesture_enabled">true</bool>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -2609,11 +2609,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    }



    private String getOldDefaultDeviceName() {

        return mContext.getResources().getString(R.string.def_device_name_old,

        return mContext.getResources().getString(R.string.def_device_name,

                Build.MANUFACTURER, Build.MODEL);

    }



    private String getDefaultDeviceName() {

        return mContext.getResources().getString(R.string.def_device_name, Build.MODEL);

        return mContext.getResources().getString(R.string.def_device_name_simple, Build.MODEL);

    }

}