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

Commit d983b4cd authored by Michael Chan's avatar Michael Chan
Browse files

b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete 

Null cursor was returned from query

Change-Id: I68d3852756b159a63c9d4c9aa889ac6edaa16015
parent 666a5ed9

core/java/android/util/CalendarUtils.java

+6 −0
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@ public class CalendarUtils { 
            @Override

            protected void onQueryComplete(int token, Object cookie, Cursor cursor) {

                synchronized (mTZCallbacks) {

                    if (cursor == null) {

                        mTZQueryInProgress = false;

                        mFirstTZRequest = true;

                        return;

                    }



                    boolean writePrefs = false;

                    // Check the values in the db

                    int keyColumn = cursor.getColumnIndexOrThrow(CalendarCache.KEY);