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

Commit a4a3e9df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null checks on content resolver query"

parents d02e1c30 9bbe0bb4

services/core/java/com/android/server/notification/CalendarTracker.java

+5 −3
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ public class CalendarTracker { 
        final Cursor cursor = mUserContext.getContentResolver().query(Attendees.CONTENT_URI,

                ATTENDEE_PROJECTION, selection, selectionArgs, null);

        try {

            if (cursor.getCount() == 0) {

            if (cursor == null || cursor.getCount() == 0) {

                if (DEBUG) Log.d(TAG, "No attendees found");

                return true;

            }

            boolean rt = false;

            while (cursor.moveToNext()) {

            while (cursor != null && cursor.moveToNext()) {

                final long rowEventId = cursor.getLong(0);

                final String rowEmail = cursor.getString(1);

                final int status = cursor.getInt(2);
@@ -200,7 +200,9 @@ public class CalendarTracker { 
            }

            return rt;

        } finally {

            if (cursor != null) {

                cursor.close();

            }

            if (DEBUG) Log.d(TAG, "meetsAttendee took " + (System.currentTimeMillis() - start));

        }

    }