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

Commit 124b2559 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add logging to indicate how many call log rows are clean...""... 

Merge "Revert "Add logging to indicate how many call log rows are clean..."" into udc-qpr-dev am: 66c1ccac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24245736



Change-Id: I6e941473b208edc4bb166447240d2a4129c3ee07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da3e2650 66c1ccac

core/java/android/provider/CallLog.java

+5 −7
Original line number Diff line number Diff line
@@ -1985,14 +1985,13 @@ public class CallLog { 
                    Log.w(LOG_TAG, "Failed to insert into call log; null result uri.");

                }



                int numDeleted;

                if (values.containsKey(PHONE_ACCOUNT_ID)

                        && !TextUtils.isEmpty(values.getAsString(PHONE_ACCOUNT_ID))

                        && values.containsKey(PHONE_ACCOUNT_COMPONENT_NAME)

                        && !TextUtils.isEmpty(values.getAsString(PHONE_ACCOUNT_COMPONENT_NAME))) {

                    // Only purge entries for the same phone account.

                    numDeleted = resolver.delete(uri, "_id IN "

                            + "(SELECT _id FROM calls"

                    resolver.delete(uri, "_id IN " +

                            "(SELECT _id FROM calls"

                            + " WHERE " + PHONE_ACCOUNT_COMPONENT_NAME + " = ?"

                            + " AND " + PHONE_ACCOUNT_ID + " = ?"

                            + " ORDER BY " + DEFAULT_SORT_ORDER
@@ -2002,15 +2001,14 @@ public class CallLog { 
                    });

                } else {

                    // No valid phone account specified, so default to the old behavior.

                    numDeleted = resolver.delete(uri, "_id IN "

                            + "(SELECT _id FROM calls ORDER BY " + DEFAULT_SORT_ORDER

                    resolver.delete(uri, "_id IN " +

                            "(SELECT _id FROM calls ORDER BY " + DEFAULT_SORT_ORDER

                            + " LIMIT -1 OFFSET 500)", null);

                }

                Log.i(LOG_TAG, "addEntry: cleaned up " + numDeleted + " old entries");



                return result;

            } catch (IllegalArgumentException e) {

                Log.e(LOG_TAG, "Failed to insert calllog", e);

                Log.w(LOG_TAG, "Failed to insert calllog", e);

                // Even though we make sure the target user is running and decrypted before calling

                // this method, there's a chance that the user just got shut down, in which case

                // we'll still get "IllegalArgumentException: Unknown URL content://call_log/calls".