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

Commit adfe6383 authored by Tom Taylor's avatar Tom Taylor Committed by Android (Google) Code Review
Browse files

Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1

parents d7f36121 fbf1d27d

core/java/android/provider/Telephony.java

+0 −3
Original line number Diff line number Diff line
@@ -1271,9 +1271,6 @@ public final class Telephony { 


            Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),

                    uri, ID_PROJECTION, null, null, null);

            if (DEBUG) {

                Log.v(TAG, "getOrCreateThreadId cursor cnt: " + cursor.getCount());

            }

            if (cursor != null) {

                try {

                    if (cursor.moveToFirst()) {