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

Commit 2abed571 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Close cursor with try resource statement in CallLogPullRequest" am: f25a88fc 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2469163



Change-Id: I4dfe73b3c352558d713f22770f05a4a58b388edd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab5e174e f25a88fc

android/app/src/com/android/bluetooth/pbapclient/CallLogPullRequest.java

+11 −10
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ public class CallLogPullRequest extends PullRequest { 
            values.put(ContactsContract.RawContacts.TIMES_CONTACTED, mCallCounter.get(key));

            values.put(ContactsContract.RawContacts.TIMES_CONTACTED, mCallCounter.get(key));

            Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,

            Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,

                    Uri.encode(key));

                    Uri.encode(key));

            Cursor c = mContext.getContentResolver().query(uri, null, null, null);

            try (Cursor c = mContext.getContentResolver().query(uri, null, null, null)) {

                if (c != null && c.getCount() > 0) {

                if (c != null && c.getCount() > 0) {

                    c.moveToNext();

                    c.moveToNext();

                    String contactId = c.getString(c.getColumnIndex(

                    String contactId = c.getString(c.getColumnIndex(
@@ -160,6 +160,7 @@ public class CallLogPullRequest extends PullRequest { 
                            ContactsContract.RawContacts.CONTENT_URI, values, where, null);

                            ContactsContract.RawContacts.CONTENT_URI, values, where, null);

                }

                }

            }

            }

        }

        if (DBG) {

        if (DBG) {

            Log.d(TAG, "Updated TIMES_CONTACTED");

            Log.d(TAG, "Updated TIMES_CONTACTED");

        }

        }