From 645ce40d13e4ef995b110b5c4191ecd333e4c5c4 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 18 Apr 2023 04:04:14 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I9d2588f352f79dcbb87bd746e42adacb4de1b0a3 --- res/values-as/strings.xml | 2 +- res/values-en-rCA/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index dff8c453..7843081c 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -16,7 +16,7 @@ - "Android Core এপসমূহ" + "Android Core এপ্‌সমূহ" "সম্পৰ্কসমূহৰ ষ্ট’ৰেজ" "সম্পর্কবোৰ" "সম্পৰ্কসূচী আপগ্ৰেড কৰিবলৈ অধিক মেম\'ৰিৰ প্ৰয়োজন।" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index c62b699a..4b621199 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -19,7 +19,7 @@ "Android Core Apps" "Contacts Storage" "Contacts" - "Contact upgrade needs more memory." + "Contacts upgrade needs more memory." "Upgrading storage for contacts" "Tap to complete the upgrade." "Contacts" @@ -29,7 +29,7 @@ "You are about to 1) make a copy of your database which includes all contacts related information and all call log to the internal storage, and 2) email it. Remember to delete the copy as soon as you have successfully copied it off the device or the email is received." "Delete now" "Start" - "Choose a programme to send your file" + "Choose a program to send your file" "Contacts Db attached" "Attached is my contacts database with all my contacts information. Handle with care." -- cgit v1.2.3 From 937ff823420cb3c2d8fd7dfa05a69ccc57328e3d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 9 May 2023 16:15:40 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I36d8f8364808ed02fd0bbbd3d296019521647d8a --- res/values-et/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index d5dbf950..bcaedf7a 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -19,7 +19,7 @@ "Androidi tuumrakendused" "Kontaktiruum" "Kontaktid" - "Kontaktisikute uuendamiseks on vaja rohkem mälu" + "Kontaktisikute uuendamiseks on vaja rohkem mäluruumi." "Kontaktide salvestusruumi uuendamine" "Puudutage täiendamise lõpetamiseks." "Kontaktid" -- cgit v1.2.3 From 50e723612098d59b0dfbab5c63a597d6e28ae795 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 9 May 2023 20:48:31 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: If0e6827eccdd264ddeae430878f8d88b08008079 --- res/values-et/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index d5dbf950..bcaedf7a 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -19,7 +19,7 @@ "Androidi tuumrakendused" "Kontaktiruum" "Kontaktid" - "Kontaktisikute uuendamiseks on vaja rohkem mälu" + "Kontaktisikute uuendamiseks on vaja rohkem mäluruumi." "Kontaktide salvestusruumi uuendamine" "Puudutage täiendamise lõpetamiseks." "Kontaktid" -- cgit v1.2.3 From aa32ab64de7a3f7c55448d44e4f161b2c523dcbe Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 12 Jun 2023 11:49:33 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I0525b3fe88a61c7c7f6fffedcd1b17d711b62ad1 --- res/values-ne/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index fd716daf..4fd36c1c 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -18,11 +18,11 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "एन्ड्रोइड कोर एपहरू" "सम्पर्कहरू भण्डारण" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "सम्पर्क अद्यावधिकका लागि अझै धेरै मेमोरी चाहिन्छ।" "सम्पर्कका लागि भणडारण अद्यावधिक गर्दै" "स्तरवृद्धि पूरा गर्न ट्याप गर्नुहोस्।" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "अन्य" "बाट भ्वाइसमेल " "सम्पर्क डेटाबेस प्रतिलिप गर्नुहोस्" -- cgit v1.2.3 From 4d4cfd01bd5029dffa368c498a1111dc6c502abb Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 13 Jun 2023 02:00:06 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2371eca313f7e89b41ae3a132c10a7ebffaca7bb --- res/values-ne/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index fd716daf..4fd36c1c 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -18,11 +18,11 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "एन्ड्रोइड कोर एपहरू" "सम्पर्कहरू भण्डारण" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "सम्पर्क अद्यावधिकका लागि अझै धेरै मेमोरी चाहिन्छ।" "सम्पर्कका लागि भणडारण अद्यावधिक गर्दै" "स्तरवृद्धि पूरा गर्न ट्याप गर्नुहोस्।" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "अन्य" "बाट भ्वाइसमेल " "सम्पर्क डेटाबेस प्रतिलिप गर्नुहोस्" -- cgit v1.2.3 From 840c7c718b102064e9b72f9ce509d3a78e2e9301 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 22 Jun 2023 20:47:15 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I21a2836fd64baa5977245e0f21d1f956d764cee6 --- res/values-ne/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index fd716daf..4fd36c1c 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -18,11 +18,11 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "एन्ड्रोइड कोर एपहरू" "सम्पर्कहरू भण्डारण" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "सम्पर्क अद्यावधिकका लागि अझै धेरै मेमोरी चाहिन्छ।" "सम्पर्कका लागि भणडारण अद्यावधिक गर्दै" "स्तरवृद्धि पूरा गर्न ट्याप गर्नुहोस्।" - "सम्पर्कहरू" + "कन्ट्याक्टहरू" "अन्य" "बाट भ्वाइसमेल " "सम्पर्क डेटाबेस प्रतिलिप गर्नुहोस्" -- cgit v1.2.3 From 9cb18e2925223000312523b477f029db8e2ecfd4 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Fri, 21 Jul 2023 23:42:00 +0000 Subject: Improve CallLogProvider logging to help in issue diagnosis. Added LocalLog which logs the last few calls we have logged to the call log. This helps ensure we can quickly reconcile when Telecom says it has logged a call to what the provider actually knows was logged. Bug: 290557274 Test: Manually tested new logs and dumpsys for call log provider. Change-Id: If4f5bde62e58a3c0743745757f746b63d1d0225e --- src/com/android/providers/contacts/CallLogProvider.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index da2d0b8a..8e29a18f 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -60,6 +60,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArrayMap; import android.util.EventLog; +import android.util.LocalLog; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -314,6 +315,7 @@ public class CallLogProvider extends ContentProvider { private VoicemailPermissions mVoicemailPermissions; private CallLogInsertionHelper mCallLogInsertionHelper; private SubscriptionManager mSubscriptionManager; + private LocalLog mLocalLog = new LocalLog(20); private final ThreadLocal mApplyingBatch = new ThreadLocal<>(); private final ThreadLocal mCallingUid = new ThreadLocal<>(); @@ -751,6 +753,10 @@ public class CallLogProvider extends ContentProvider { mCallLogInsertionHelper.addComputedValues(copiedValues); long rowId = createDatabaseModifier(mCallsInserter).insert(copiedValues); + String insertLog = String.format("insert uid/pid=%d/%d, uri=%s, rowId=%d", + Binder.getCallingUid(), Binder.getCallingPid(), uri, rowId); + Log.i(TAG, insertLog); + mLocalLog.log(insertLog); if (rowId > 0) { return ContentUris.withAppendedId(uri, rowId); } @@ -1376,6 +1382,9 @@ public class CallLogProvider extends ContentProvider { @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { mStats.dump(writer, " "); + writer.println(); + writer.println("Latest call log activity:"); + mLocalLog.dump(writer); } /** -- cgit v1.2.3 From ddec12eca890718771897a710454a4d3b8b00115 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Fri, 28 Jul 2023 20:12:55 +0000 Subject: Revert "Improve CallLogProvider logging to help in issue diagnosis." Revert submission 24179730-cherrypick-calllog-logging-ta8jp2a4iaa Reason for revert: Moving to D1-Dev and going to make some other logging improvements. Reverted changes: /q/submissionid:24179730-cherrypick-calllog-logging-ta8jp2a4iaa Bug: 290557274 Change-Id: Ie8b09bdb9e604f61ea1d995978d8a3a45e068406 Test: Build. --- src/com/android/providers/contacts/CallLogProvider.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index 8e29a18f..da2d0b8a 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -60,7 +60,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArrayMap; import android.util.EventLog; -import android.util.LocalLog; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -315,7 +314,6 @@ public class CallLogProvider extends ContentProvider { private VoicemailPermissions mVoicemailPermissions; private CallLogInsertionHelper mCallLogInsertionHelper; private SubscriptionManager mSubscriptionManager; - private LocalLog mLocalLog = new LocalLog(20); private final ThreadLocal mApplyingBatch = new ThreadLocal<>(); private final ThreadLocal mCallingUid = new ThreadLocal<>(); @@ -753,10 +751,6 @@ public class CallLogProvider extends ContentProvider { mCallLogInsertionHelper.addComputedValues(copiedValues); long rowId = createDatabaseModifier(mCallsInserter).insert(copiedValues); - String insertLog = String.format("insert uid/pid=%d/%d, uri=%s, rowId=%d", - Binder.getCallingUid(), Binder.getCallingPid(), uri, rowId); - Log.i(TAG, insertLog); - mLocalLog.log(insertLog); if (rowId > 0) { return ContentUris.withAppendedId(uri, rowId); } @@ -1382,9 +1376,6 @@ public class CallLogProvider extends ContentProvider { @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { mStats.dump(writer, " "); - writer.println(); - writer.println("Latest call log activity:"); - mLocalLog.dump(writer); } /** -- cgit v1.2.3 From 1b5b039b465cf1329ef38f92f010b3a8e029e590 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Fri, 21 Jul 2023 23:42:00 +0000 Subject: Improve CallLogProvider logging to help in issue diagnosis. Added LocalLog which logs the last few calls we have logged to the call log. This helps ensure we can quickly reconcile when Telecom says it has logged a call to what the provider actually knows was logged. Bug: 290557274 Test: Manually tested new logs and dumpsys for call log provider. Change-Id: If4f5bde62e58a3c0743745757f746b63d1d0225e --- .../providers/contacts/CallLogProvider.java | 45 +++++++++++++++++++--- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index da2d0b8a..01f3d577 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -60,6 +60,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArrayMap; import android.util.EventLog; +import android.util.LocalLog; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -314,6 +315,7 @@ public class CallLogProvider extends ContentProvider { private VoicemailPermissions mVoicemailPermissions; private CallLogInsertionHelper mCallLogInsertionHelper; private SubscriptionManager mSubscriptionManager; + private LocalLog mLocalLog = new LocalLog(20); private final ThreadLocal mApplyingBatch = new ThreadLocal<>(); private final ThreadLocal mCallingUid = new ThreadLocal<>(); @@ -681,7 +683,7 @@ public class CallLogProvider extends ContentProvider { final int callingUid = applyingBatch() ? mCallingUid.get() : Binder.getCallingUid(); - mStats.incrementInsertStats(callingUid, applyingBatch()); + mStats.incrementUpdateStats(callingUid, applyingBatch()); try { return updateInternal(uri, values, selection, selectionArgs); } finally { @@ -694,7 +696,7 @@ public class CallLogProvider extends ContentProvider { final int callingUid = applyingBatch() ? mCallingUid.get() : Binder.getCallingUid(); - mStats.incrementInsertStats(callingUid, applyingBatch()); + mStats.incrementDeleteStats(callingUid, applyingBatch()); try { return deleteInternal(uri, selection, selectionArgs); } finally { @@ -751,6 +753,11 @@ public class CallLogProvider extends ContentProvider { mCallLogInsertionHelper.addComputedValues(copiedValues); long rowId = createDatabaseModifier(mCallsInserter).insert(copiedValues); + String insertLog = String.format(Locale.getDefault(), + "insert uid/pid=%d/%d, uri=%s, rowId=%d", + Binder.getCallingUid(), Binder.getCallingPid(), uri, rowId); + Log.i(TAG, insertLog); + mLocalLog.log(insertLog); if (rowId > 0) { return ContentUris.withAppendedId(uri, rowId); } @@ -959,8 +966,16 @@ public class CallLogProvider extends ContentProvider { throw new UnsupportedOperationException("Cannot update URL: " + uri); } - return createDatabaseModifier(db, hasReadVoicemailPermission).update(uri, Tables.CALLS, + int count = createDatabaseModifier(db, hasReadVoicemailPermission).update(uri, Tables.CALLS, values, selectionBuilder.build(), selectionArgs); + + String logStr = String.format(Locale. getDefault(), + "update uid/pid=%d/%d, uri=%s, numChanged=%d", + Binder.getCallingUid(), Binder.getCallingPid(), uri, count); + Log.i(TAG, logStr); + mLocalLog.log(logStr); + + return count; } private int deleteInternal(Uri uri, String selection, String[] selectionArgs) { @@ -981,8 +996,14 @@ public class CallLogProvider extends ContentProvider { final int matchedUriId = sURIMatcher.match(uri); switch (matchedUriId) { case CALLS: - return createDatabaseModifier(db, hasReadVoicemailPermission).delete(Tables.CALLS, - selectionBuilder.build(), selectionArgs); + int count = createDatabaseModifier(db, hasReadVoicemailPermission).delete( + Tables.CALLS, selectionBuilder.build(), selectionArgs); + String logStr = String.format(Locale. getDefault(), + "delete uid/pid=%d/%d, uri=%s, numChanged=%d", + Binder.getCallingUid(), Binder.getCallingPid(), uri, count); + Log.i(TAG, logStr); + mLocalLog.log(logStr); + return count; case CALL_COMPOSER_PICTURE: // TODO(hallliu): implement deletion of file when the corresponding calllog entry // gets deleted as well. @@ -1127,10 +1148,21 @@ public class CallLogProvider extends ContentProvider { new String[] {String.valueOf(lastSyncTime)}, Calls.DATE + " ASC"); if (cursor == null) { + Log.i(TAG, String.format(Locale.getDefault(), + "syncEntriesFrom: fromUserId=%d, srcIsShadow=%b, forAllUsers=%b; nothing to " + + "sync", + sourceUserId, sourceIsShadow, forAllUsersOnly)); return; } try { newestTimeStamp = copyEntriesFromCursor(cursor, lastSyncTime, sourceIsShadow); + Log.i(TAG, + String.format(Locale.getDefault(), + "syncEntriesFrom: fromUserId=%d, srcIsShadow=%b, forAllUsers=%b; " + + "previousTimeStamp=%d, newTimeStamp=%d, entries=%d", + sourceUserId, sourceIsShadow, forAllUsersOnly, lastSyncTime, + newestTimeStamp, + cursor.getCount())); } finally { cursor.close(); } @@ -1376,6 +1408,9 @@ public class CallLogProvider extends ContentProvider { @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { mStats.dump(writer, " "); + writer.println(); + writer.println("Latest call log activity:"); + mLocalLog.dump(writer); } /** -- cgit v1.2.3