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

Commit 529cd1d4 authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Added debug level check before timezone error log. 

In the situation where the timezones are not properly available,
where the number of timezone labels mismatches the number of timezones
IDs, ensure that Log.i will log before creating the extra log of which
timezones have been found.

Change-Id: I54eac299a3c93b7a16ec704b48153663a7cea123
parent c809bbd4

src/com/android/calendar/TimezoneAdapter.java

+14 −12
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ public class TimezoneAdapter extends ArrayAdapter<TimezoneRow> { 
            if (ids.length != labels.length) {

                Log.e(TAG, "ids length (" + ids.length + ") and labels length(" + labels.length +

                        ") should be equal but aren't.");

                if (Log.isLoggable(TAG, Log.DEBUG)) {

                    StringBuilder tzLog = new StringBuilder();

                    for (int id_i = 0; id_i < Math.max(ids.length, labels.length); id_i++) {

                        String id, label;
@@ -417,6 +418,7 @@ public class TimezoneAdapter extends ArrayAdapter<TimezoneRow> { 
                        .append("label=").append(label).append("\n");

                    }

                    Log.i(TAG, tzLog.toString());

                }

                if (ids.length > labels.length) {

                    length = labels.length;

                }