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

Commit 3bd71ab7 authored by Jack Yoo's avatar Jack Yoo Committed by Steve Kondik
Browse files

Keyguard: Adding null check for dateformat 

Checking if null before accessing dateformat string.

Change-Id: I2337508cfc15df22f379f7396534bd521d27f095
parent 8f58d28a

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

+4 −1
Original line number Diff line number Diff line
@@ -236,7 +236,10 @@ public class KeyguardStatusView extends GridLayout { 
            if (res.getBoolean(com.android.internal.R.bool.def_custom_dateformat)) {

                final String dateformat = Settings.System.getString(context.getContentResolver(),

                        Settings.System.DATE_FORMAT);

                if(dateformat != null)

                    dateView = dateformat.equals(dateView) ? dateView : dateformat;

                else

                    Log.e(TAG, "def_custom_dateformat is true but dataformat is not defined actually.");

            } else {

                final String key = locale.toString() + dateViewSkel + clockView12Skel

                        + clockView24Skel;