DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: Ie57d208a8adf88a9c2e7396291918d5f6688118e
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ff83b8f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,31 @@
+android_app {
+ name: "ContactsProvider",
+ // Only compile source java files in this apk.
+ srcs: [
+ "src/**/*.java",
+ "src/com/android/providers/contacts/EventLogTags.logtags",
+ ],
+ libs: [
+ "ext",
+ "telephony-common",
+ ],
+ static_libs: [
+ "android-common",
+ "com.android.vcard",
+ "guava",
+ ],
+ // The Jacoco tool analyzes code coverage when running unit tests on the
+ // application. This configuration line selects which packages will be analyzed,
+ // leaving out code which is tested by other means (e.g. static libraries) that
+ // would dilute the coverage results. These options do not affect regular
+ // production builds.
+ jacoco: {
+ include_filter: ["com.android.providers.contacts.*"],
+ },
+ platform_apis: true,
+ certificate: "shared",
+ privileged: true,
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index d31ad73..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += \
- src/com/android/providers/contacts/EventLogTags.logtags
-
-LOCAL_JAVA_LIBRARIES := ext telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES += android-common com.android.vcard guava
-
-# The Jacoco tool analyzes code coverage when running unit tests on the
-# application. This configuration line selects which packages will be analyzed,
-# leaving out code which is tested by other means (e.g. static libraries) that
-# would dilute the coverage results. These options do not affect regular
-# production builds.
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.providers.contacts.*
-
-LOCAL_PACKAGE_NAME := ContactsProvider
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := shared
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 1576ba2..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core এপসমূহ"</string>
- <string name="app_label" msgid="3389954322874982620">"সম্পৰ্কসমূহৰ সঞ্চয়াগাৰ"</string>
- <string name="provider_label" msgid="6012150850819899907">"সম্পর্কবোৰ"</string>
- <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"সম্পৰ্কসূচী আপগ্ৰেড কৰিবলৈ অধিক মেম\'ৰিৰ প্ৰয়োজন।"</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"সম্পৰ্কসূচীৰ বাবে সঞ্চয়াগাৰ আপগ্ৰেড কৰিথকা হৈছে"</string>
- <string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"আপগ্ৰেড প্ৰক্ৰিয়া সম্পূৰ্ণ কৰিবলৈ টিপক।"</string>
- <string name="default_directory" msgid="93961630309570294">"সম্পর্কসূচী"</string>
- <string name="local_invisible_directory" msgid="705244318477396120">"অন্যান্য"</string>
- <string name="voicemail_from_column" msgid="435732568832121444">"ইয়াৰ পৰা অহা ভইচমেল "</string>
- <string name="debug_dump_title" msgid="4916885724165570279">"সম্পৰ্কসূচীৰ ডেটাবেছ প্ৰতিলিপি কৰক"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"আপুনি এই কাৰ্যবোৰ কৰিবলৈ লৈছে ১) সকলো সম্পৰ্ক সম্বন্ধীয় তথ্য় আৰু কল লগ সন্নিবিষ্ট থকা আপোনাৰ ডেটাবেছক আভ্য়ন্তৰীণ সঞ্চয়াগাৰলৈ প্ৰতিলিপি কৰা আৰু ২) ইয়াক ইমেইল কৰা। ডিভাইচৰ পৰা সফলতাৰে প্ৰতিলিপি কৰাৰ বা ইমেইল পোৱাৰ পিছত উক্ত প্ৰতিলিপি মচিবলৈ নাপাহৰিব।"</string>
- <string name="debug_dump_delete_button" msgid="7832879421132026435">"এতিয়াই মচক"</string>
- <string name="debug_dump_start_button" msgid="2837506913757600001">"আৰম্ভ কৰক"</string>
- <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"আপোনাৰ ফাইল পঠাবলৈ কোনো প্ৰ\'গ্ৰাম বাছনি কৰক"</string>
- <string name="debug_dump_email_subject" msgid="108188398416385976">"সম্পৰ্কসূচী Db সংলগ্ন কৰা হ’ল"</string>
- <string name="debug_dump_email_body" msgid="4577749800871444318">"মোৰ সকলো সম্পৰ্ক তথ্য়সহ মোৰ সম্পৰ্কসূচী সংলগ্ন কৰা হ’ল। সাবধানে চলাব।"</string>
-</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 47fc931..489b5b7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,7 +27,7 @@
<string name="voicemail_from_column" msgid="435732568832121444">"Hlasová zpráva od uživatele "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"Kopírování databáze kontaktů"</string>
<string name="debug_dump_database_message" msgid="406438635002392290">"Chystáte se 1) vytvořit v interním úložišti kopii databáze obsahující všechny informace o kontaktech a veškerou historii hovorů a 2) odeslat ji e-mailem. Po úspěšném zkopírování ze zařízení nebo přijetí e-mailem ji nezapomeňte ihned odstranit."</string>
- <string name="debug_dump_delete_button" msgid="7832879421132026435">"Smazat teď"</string>
+ <string name="debug_dump_delete_button" msgid="7832879421132026435">"Smazat nyní"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"Spustit"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Vyberte program pro odeslání souboru."</string>
<string name="debug_dump_email_subject" msgid="108188398416385976">"Databáze kontaktů v příloze"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index af92fe7..fde3a2f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,18 +18,18 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="sharedUserLabel" msgid="8024311725474286801">"Android-kerneapplikationer"</string>
<string name="app_label" msgid="3389954322874982620">"Lagring af kontakter"</string>
- <string name="provider_label" msgid="6012150850819899907">"Kontakter"</string>
- <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Opgradering af kontakter kræver mere hukommelse."</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Opgraderer lagring af kontakter"</string>
+ <string name="provider_label" msgid="6012150850819899907">"Kontaktpersoner"</string>
+ <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Opgradering af kontaktpersoner kræver mere hukommelse."</string>
+ <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Opgraderer lagring af kontaktpersoner"</string>
<string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"Tryk for at gennemføre opgraderingen."</string>
- <string name="default_directory" msgid="93961630309570294">"Kontakter"</string>
+ <string name="default_directory" msgid="93961630309570294">"Kontaktpersoner"</string>
<string name="local_invisible_directory" msgid="705244318477396120">"Andre"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"Telefonsvarerbesked fra "</string>
- <string name="debug_dump_title" msgid="4916885724165570279">"Kopiér database med kontakter"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontakter og alle opkaldslister, til det interne lager, og 2) sende den som mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller mailen er modtaget."</string>
+ <string name="debug_dump_title" msgid="4916885724165570279">"Kopiér database med kontaktpersoner"</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontaktpersoner og alle opkaldslister, til det interne lager, og 2) sende den som e-mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller e-mailen er modtaget."</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"Slet nu"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"Start"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Vælg et program, for at sende din fil"</string>
- <string name="debug_dump_email_subject" msgid="108188398416385976">"Database med kontakter er vedhæftet"</string>
- <string name="debug_dump_email_body" msgid="4577749800871444318">"Min database med kontakter med alle oplysninger om mine kontakter er vedhæftet. Brug den med omhu."</string>
+ <string name="debug_dump_email_subject" msgid="108188398416385976">"Database med kontaktpersoner er vedhæftet"</string>
+ <string name="debug_dump_email_body" msgid="4577749800871444318">"Min database med kontaktpersoner med alle oplysninger om mine kontaktpersoner er vedhæftet. Brug den med omhu."</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4af29ec..3266571 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -26,7 +26,7 @@
<string name="local_invisible_directory" msgid="705244318477396120">"سایر موارد"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"پست صوتی از "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"کپی پایگاه داده مخاطبین"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"شما در شرف ۱) ایجاد یک کپی از پایگاه داده در حافظه داخلی هستید، این کپی حاوی همه اطلاعات مربوط به مخاطبین و همه گزارشات تماس است و همچنین میخواهید ۲) آنرا ایمیل کنید. به خاطر داشته باشید که به محض کپی کردن این نسخه در دستگاه یا دریافت ایمیل، آنرا حذف کنید."</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"شما در شرف ۱) ایجاد یک کپی از پایگاه داده در حافظه داخلی هستید، این کپی حاوی همه اطلاعات مربوط به مخاطبین و همه گزارشات تماس است و همچنین میخواهید ۲) آنرا رایانامه کنید. به خاطر داشته باشید که به محض کپی کردن این نسخه در دستگاه یا دریافت رایانامه، آنرا حذف کنید."</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"اکنون حذف شود"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"شروع"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"یک برنامه را برای ارسال فایل خود انتخاب کنید"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 67014ca..a4f324e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -26,10 +26,10 @@
<string name="local_invisible_directory" msgid="705244318477396120">"इतर"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"कडून व्हॉईसमेल "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"संपर्क डेटाबेस कॉपी करा"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"तुम्ही 1) आपल्या डेटाबेसची प्रत बनवणार आहात जिच्यामध्ये सर्व संपर्कांसंबंधी माहिती आणि अंतर्गत संचयनावरील कॉल लॉग समाविष्ट असतात आणि 2) ती ईमेल करणार आहात. तुम्ही डिव्हाइसवरून यशस्वीरित्या प्रत कॉपी केल्यानंतर किंवा ईमेल प्राप्त केल्यानंतर लगेच ती हटविण्याचे लक्षात ठेवा."</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"आपण 1) आपल्या डेटाबेसची प्रत बनवणार आहात जिच्यामध्ये सर्व संपर्कांसंबंधी माहिती आणि अंतर्गत संचयनावरील कॉल लॉग समाविष्ट असतात आणि 2) ती ईमेल करणार आहात. आपण डिव्हाइसवरून यशस्वीरित्या प्रत कॉपी केल्यानंतर किंवा ईमेल प्राप्त केल्यानंतर लगेच ती हटविण्याचे लक्षात ठेवा."</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"आता हटवा"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"प्रारंभ करा"</string>
- <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"तुमची फाईल पाठविण्यासाठी एक प्रोग्राम निवडा"</string>
+ <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"आपली फाईल पाठविण्यासाठी एक प्रोग्राम निवडा"</string>
<string name="debug_dump_email_subject" msgid="108188398416385976">"संपर्क Db संलग्न केला"</string>
<string name="debug_dump_email_body" msgid="4577749800871444318">"संलग्न केलेला माझ्या सर्व संपर्क माहितीसह माझा संपर्क डेटाबेस आहे. काळजीपूर्वक हाताळणी करा."</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 02cb4d5..a8f2cb9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -20,7 +20,7 @@
<string name="app_label" msgid="3389954322874982620">"လိပ်စာများသိမ်းဆည်းသောအပ်ပလီကေးရှင်း"</string>
<string name="provider_label" msgid="6012150850819899907">"အဆက်အသွယ်များ"</string>
<string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"အဆက်အသွယ်များ အဆင့်မြှင့်ခြင်းအတွက် မှတ်ဉာဏ်စွမ်းရည်ပိုလိုအပ်သည်"</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"အဆယ်အသွယ်များ သိမ်းရန် နေရာ အဆင့်မြှင့်ခြင်း"</string>
+ <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"အဆယ်အသွယ်များ သိမ်းဆည်းရန် နေရာ အဆင့်မြှင့်ခြင်း"</string>
<string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"အဆင့်မြှင့်တင်ခြင်းပြီးမြောက်ရန် တို့ပါ။"</string>
<string name="default_directory" msgid="93961630309570294">"အဆက်အသွယ်များ"</string>
<string name="local_invisible_directory" msgid="705244318477396120">"တစ်ခြား"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index c6bfa21..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="sharedUserLabel" msgid="8024311725474286801">"Android କୋର୍ ଆପ୍"</string>
- <string name="app_label" msgid="3389954322874982620">"ଯୋଗାଯୋଗ ଷ୍ଟୋରେଜ୍"</string>
- <string name="provider_label" msgid="6012150850819899907">"ଯୋଗାଯୋଗ"</string>
- <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"ଯୋଗାଯୋଗ ଅପଗ୍ରେଡ୍ ପାଇଁ ଅଧିକ ମେମୋରୀ ଦରକାର।"</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"ଯୋଗାଯୋଗ ପାଇଁ ଷ୍ଟୋରେଜ୍ ଅପଗ୍ରେଡ୍ କରାଯାଉଛି"</string>
- <string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"ଅପଗ୍ରେଡ୍ ସମ୍ପୂର୍ଣ୍ଣ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
- <string name="default_directory" msgid="93961630309570294">"ଯୋଗାଯୋଗ"</string>
- <string name="local_invisible_directory" msgid="705244318477396120">"ଅନ୍ୟାନ୍ୟ"</string>
- <string name="voicemail_from_column" msgid="435732568832121444">"ଏହାଙ୍କଠାରୁ ଭଏସମେଲ୍ "</string>
- <string name="debug_dump_title" msgid="4916885724165570279">"ଯୋଗାଯୋଗ ଡାଟାବେସ୍ କପୀ କରନ୍ତୁ"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"ଆପଣ 1) ଇଣ୍ଟର୍ନଲ ଷ୍ଟୋରେଜରେ ନିଜ ଡାଟାବେସ୍ର ଏକ କପୀ ବନାନ୍ତୁ, ଯେଉଁଥିରେ ଯୋଗାଯୋଗ ସମ୍ବନ୍ଧିତ ସମସ୍ତ ତଥ୍ୟ ଏବଂ କଲ୍ ଲଗ୍ ସାମିଲ ରହିବ ଏବଂ 2) ଏହାକୁ ଇମେଲ୍ କରନ୍ତୁ। ମନେରଖନ୍ତୁ, ଡିଭାଇସ୍ରୁ ସଫଳତାପୂର୍ବକ ଏହାର କପୀ କରିସାରିବା ପରେ କିମ୍ୱା ଇମେଲ୍ ପ୍ରାପ୍ତ ହୋଇସାରିବା ପରେ, ଏହି କପୀକୁ ଡିଲିଟ୍ କରିଦେବେ।"</string>
- <string name="debug_dump_delete_button" msgid="7832879421132026435">"ବର୍ତ୍ତମାନ ଡିଲିଟ୍ କରନ୍ତୁ"</string>
- <string name="debug_dump_start_button" msgid="2837506913757600001">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
- <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"ନିଜ ଫାଇଲ ପଠାଇବା ପାଇଁ ଗୋଟିଏ ପ୍ରୋଗ୍ରାମ୍ ବାଛନ୍ତୁ"</string>
- <string name="debug_dump_email_subject" msgid="108188398416385976">"ଯୋଗାଯୋଗ Db ଆଟାଚ୍ କରାଗଲା"</string>
- <string name="debug_dump_email_body" msgid="4577749800871444318">"ମୋର ସମସ୍ତ ଯୋଗାଯୋଗ ସୂଚନା ସହିତ ମୋର ଯୋଗାଯୋଗ ଡାଟାବେସ୍କୁ ଆଟାଚ୍ କରାଯାଇଛି। ସାବଧାନତାର ସହ କାମ କରନ୍ତୁ।"</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index decb5b6..f259d83 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -26,7 +26,7 @@
<string name="local_invisible_directory" msgid="705244318477396120">"其他"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"語音郵件寄件者： "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"複製聯絡人資料庫"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"您即將要 1) 將您的資料庫 (包含所有聯絡人相關資訊及所有通話記錄) 複製到內部儲存空間，以及 2) 透過電子郵件傳送副本。提醒您，當您順利複製裝置上的資料或收到電子郵件後，請儘快刪除副本。"</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"您即將要 1) 將您的資料庫 (包含所有聯絡人相關資訊及所有通話紀錄) 複製到內部儲存空間，以及 2) 透過電子郵件傳送副本。提醒您，當您順利複製裝置上的資料或收到電子郵件後，請儘快刪除副本。"</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"立即刪除"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"開始"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"選擇要傳送檔案的程式"</string>
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index 736d665..39c3d5f 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -39,7 +39,7 @@
public class CallLogDatabaseHelper {
private static final String TAG = "CallLogDatabaseHelper";
- private static final int DATABASE_VERSION = 5;
+ private static final int DATABASE_VERSION = 8;
private static final boolean DEBUG = false; // DON'T SUBMIT WITH TRUE
@@ -149,6 +149,10 @@
Calls.CACHED_FORMATTED_NUMBER + " TEXT," +
Calls.ADD_FOR_ALL_USERS + " INTEGER NOT NULL DEFAULT 1," +
Calls.LAST_MODIFIED + " INTEGER DEFAULT 0," +
+ Calls.CALL_SCREENING_COMPONENT_NAME + " TEXT," +
+ Calls.CALL_SCREENING_APP_NAME + " TEXT," +
+ Calls.BLOCK_REASON + " INTEGER NOT NULL DEFAULT 0," +
+
Voicemails._DATA + " TEXT," +
Voicemails.HAS_CONTENT + " INTEGER," +
Voicemails.MIME_TYPE + " TEXT," +
@@ -204,6 +208,18 @@
if (oldVersion < 5) {
upgradeToVersion5(db);
}
+
+ if (oldVersion < 6) {
+ upgradeToVersion6(db);
+ }
+
+ if (oldVersion < 7) {
+ upgradeToVersion7(db);
+ }
+
+ if (oldVersion < 8) {
+ upgradetoVersion8(db);
+ }
}
}
@@ -280,6 +296,161 @@
}
/**
+ * Add {@link CallLog.Calls#CALL_SCREENING_COMPONENT_NAME}
+ * {@link CallLog.Calls#CALL_SCREENING_APP_NAME}
+ * {@link CallLog.Calls#BLOCK_REASON} column to the CallLog database.
+ */
+ private void upgradeToVersion6(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE calls ADD call_screening_component_name TEXT");
+ db.execSQL("ALTER TABLE calls ADD call_screening_app_name TEXT");
+ db.execSQL("ALTER TABLE calls ADD block_reason INTEGER NOT NULL DEFAULT 0");
+ }
+
+ /**
+ * Add {@code android.telecom.CallIdentification} columns; these are destined to be removed
+ * in {@link #upgradetoVersion8(SQLiteDatabase)}.
+ * @param db DB to upgrade
+ */
+ private void upgradeToVersion7(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE calls ADD call_id_package_name TEXT NULL");
+ db.execSQL("ALTER TABLE calls ADD call_id_app_name TEXT NULL");
+ db.execSQL("ALTER TABLE calls ADD call_id_name TEXT NULL");
+ db.execSQL("ALTER TABLE calls ADD call_id_description TEXT NULL");
+ db.execSQL("ALTER TABLE calls ADD call_id_details TEXT NULL");
+ db.execSQL("ALTER TABLE calls ADD call_id_nuisance_confidence INTEGER NULL");
+ }
+
+ /**
+ * Remove the {@code android.telecom.CallIdentification} column.
+ * @param db DB to upgrade
+ */
+ private void upgradetoVersion8(SQLiteDatabase db) {
+ db.beginTransaction();
+ try {
+ String oldTable = Tables.CALLS + "_old";
+ // SQLite3 doesn't support altering a column name, so we'll rename the old calls table..
+ db.execSQL("ALTER TABLE calls RENAME TO " + oldTable);
+
+ // ... create a new one (yes, this seems similar to what is in onCreate, but we can't
+ // assume that one won't change in the future) ...
+ db.execSQL("CREATE TABLE " + Tables.CALLS + " (" +
+ Calls._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+ Calls.NUMBER + " TEXT," +
+ Calls.NUMBER_PRESENTATION + " INTEGER NOT NULL DEFAULT " +
+ Calls.PRESENTATION_ALLOWED + "," +
+ Calls.POST_DIAL_DIGITS + " TEXT NOT NULL DEFAULT ''," +
+ Calls.VIA_NUMBER + " TEXT NOT NULL DEFAULT ''," +
+ Calls.DATE + " INTEGER," +
+ Calls.DURATION + " INTEGER," +
+ Calls.DATA_USAGE + " INTEGER," +
+ Calls.TYPE + " INTEGER," +
+ Calls.FEATURES + " INTEGER NOT NULL DEFAULT 0," +
+ Calls.PHONE_ACCOUNT_COMPONENT_NAME + " TEXT," +
+ Calls.PHONE_ACCOUNT_ID + " TEXT," +
+ Calls.PHONE_ACCOUNT_ADDRESS + " TEXT," +
+ Calls.PHONE_ACCOUNT_HIDDEN + " INTEGER NOT NULL DEFAULT 0," +
+ Calls.SUB_ID + " INTEGER DEFAULT -1," +
+ Calls.NEW + " INTEGER," +
+ Calls.CACHED_NAME + " TEXT," +
+ Calls.CACHED_NUMBER_TYPE + " INTEGER," +
+ Calls.CACHED_NUMBER_LABEL + " TEXT," +
+ Calls.COUNTRY_ISO + " TEXT," +
+ Calls.VOICEMAIL_URI + " TEXT," +
+ Calls.IS_READ + " INTEGER," +
+ Calls.GEOCODED_LOCATION + " TEXT," +
+ Calls.CACHED_LOOKUP_URI + " TEXT," +
+ Calls.CACHED_MATCHED_NUMBER + " TEXT," +
+ Calls.CACHED_NORMALIZED_NUMBER + " TEXT," +
+ Calls.CACHED_PHOTO_ID + " INTEGER NOT NULL DEFAULT 0," +
+ Calls.CACHED_PHOTO_URI + " TEXT," +
+ Calls.CACHED_FORMATTED_NUMBER + " TEXT," +
+ Calls.ADD_FOR_ALL_USERS + " INTEGER NOT NULL DEFAULT 1," +
+ Calls.LAST_MODIFIED + " INTEGER DEFAULT 0," +
+ Calls.CALL_SCREENING_COMPONENT_NAME + " TEXT," +
+ Calls.CALL_SCREENING_APP_NAME + " TEXT," +
+ Calls.BLOCK_REASON + " INTEGER NOT NULL DEFAULT 0," +
+
+ Voicemails._DATA + " TEXT," +
+ Voicemails.HAS_CONTENT + " INTEGER," +
+ Voicemails.MIME_TYPE + " TEXT," +
+ Voicemails.SOURCE_DATA + " TEXT," +
+ Voicemails.SOURCE_PACKAGE + " TEXT," +
+ Voicemails.TRANSCRIPTION + " TEXT," +
+ Voicemails.TRANSCRIPTION_STATE + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.STATE + " INTEGER," +
+ Voicemails.DIRTY + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.DELETED + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.BACKED_UP + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.RESTORED + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.ARCHIVED + " INTEGER NOT NULL DEFAULT 0," +
+ Voicemails.IS_OMTP_VOICEMAIL + " INTEGER NOT NULL DEFAULT 0" +
+ ");");
+
+ String allTheColumns = Calls._ID + ", " +
+ Calls.NUMBER + ", " +
+ Calls.NUMBER_PRESENTATION + ", " +
+ Calls.POST_DIAL_DIGITS + ", " +
+ Calls.VIA_NUMBER + ", " +
+ Calls.DATE + ", " +
+ Calls.DURATION + ", " +
+ Calls.DATA_USAGE + ", " +
+ Calls.TYPE + ", " +
+ Calls.FEATURES + ", " +
+ Calls.PHONE_ACCOUNT_COMPONENT_NAME + ", " +
+ Calls.PHONE_ACCOUNT_ID + ", " +
+ Calls.PHONE_ACCOUNT_ADDRESS + ", " +
+ Calls.PHONE_ACCOUNT_HIDDEN + ", " +
+ Calls.SUB_ID + ", " +
+ Calls.NEW + ", " +
+ Calls.CACHED_NAME + ", " +
+ Calls.CACHED_NUMBER_TYPE + ", " +
+ Calls.CACHED_NUMBER_LABEL + ", " +
+ Calls.COUNTRY_ISO + ", " +
+ Calls.VOICEMAIL_URI + ", " +
+ Calls.IS_READ + ", " +
+ Calls.GEOCODED_LOCATION + ", " +
+ Calls.CACHED_LOOKUP_URI + ", " +
+ Calls.CACHED_MATCHED_NUMBER + ", " +
+ Calls.CACHED_NORMALIZED_NUMBER + ", " +
+ Calls.CACHED_PHOTO_ID + ", " +
+ Calls.CACHED_PHOTO_URI + ", " +
+ Calls.CACHED_FORMATTED_NUMBER + ", " +
+ Calls.ADD_FOR_ALL_USERS + ", " +
+ Calls.LAST_MODIFIED + ", " +
+ Calls.CALL_SCREENING_COMPONENT_NAME + ", " +
+ Calls.CALL_SCREENING_APP_NAME + ", " +
+ Calls.BLOCK_REASON + ", " +
+
+ Voicemails._DATA + ", " +
+ Voicemails.HAS_CONTENT + ", " +
+ Voicemails.MIME_TYPE + ", " +
+ Voicemails.SOURCE_DATA + ", " +
+ Voicemails.SOURCE_PACKAGE + ", " +
+ Voicemails.TRANSCRIPTION + ", " +
+ Voicemails.TRANSCRIPTION_STATE + ", " +
+ Voicemails.STATE + ", " +
+ Voicemails.DIRTY + ", " +
+ Voicemails.DELETED + ", " +
+ Voicemails.BACKED_UP + ", " +
+ Voicemails.RESTORED + ", " +
+ Voicemails.ARCHIVED + ", " +
+ Voicemails.IS_OMTP_VOICEMAIL;
+
+ // .. so we insert into the new table all the values from the old table ...
+ db.execSQL("INSERT INTO " + Tables.CALLS + " (" +
+ allTheColumns + ") SELECT " +
+ allTheColumns + " FROM " + oldTable);
+
+ // .. and drop the old table we renamed.
+ db.execSQL("DROP TABLE " + oldTable);
+
+ db.setTransactionSuccessful();
+ } finally {
+ db.endTransaction();
+ }
+ }
+
+ /**
* Perform the migration from the contacts2.db (of the latest version) to the current calllog/
* voicemail status tables.
*/
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index f71a750..ff3e65c 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -157,6 +157,10 @@
sCallsProjectionMap.put(Calls.CACHED_FORMATTED_NUMBER, Calls.CACHED_FORMATTED_NUMBER);
sCallsProjectionMap.put(Calls.ADD_FOR_ALL_USERS, Calls.ADD_FOR_ALL_USERS);
sCallsProjectionMap.put(Calls.LAST_MODIFIED, Calls.LAST_MODIFIED);
+ sCallsProjectionMap
+ .put(Calls.CALL_SCREENING_COMPONENT_NAME, Calls.CALL_SCREENING_COMPONENT_NAME);
+ sCallsProjectionMap.put(Calls.CALL_SCREENING_APP_NAME, Calls.CALL_SCREENING_APP_NAME);
+ sCallsProjectionMap.put(Calls.BLOCK_REASON, Calls.BLOCK_REASON);
}
private static final String ALLOWED_PACKAGE_FOR_TESTING = "com.android.providers.contacts";
diff --git a/src/com/android/providers/contacts/ContactDirectoryManager.java b/src/com/android/providers/contacts/ContactDirectoryManager.java
index 33e541d..8a1c88b 100644
--- a/src/com/android/providers/contacts/ContactDirectoryManager.java
+++ b/src/com/android/providers/contacts/ContactDirectoryManager.java
@@ -30,9 +30,9 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemClock;
-import android.os.SystemProperties;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Directory;
+import android.sysprop.ContactsProperties;
import android.text.TextUtils;
import android.util.Log;
@@ -194,7 +194,7 @@
@VisibleForTesting
boolean isRescanNeeded() {
- if ("1".equals(SystemProperties.get("debug.cp2.scan_all_packages", "0"))) {
+ if (ContactsProperties.debug_scan_all_packages().orElse(false)) {
Log.w(TAG, "debug.cp2.scan_all_packages set to 1.");
return true; // For debugging.
}
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 9414ece..6834589 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -42,6 +42,7 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.database.sqlite.SQLiteStatement;
+import android.icu.util.VersionInfo;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
@@ -103,8 +104,6 @@
import com.android.providers.contacts.database.MoreDatabaseUtils;
import com.android.providers.contacts.util.NeededForTesting;
-import libcore.icu.ICU;
-
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -2755,7 +2754,7 @@
if (!dbLocale.equals(locales.toString())) {
return true;
}
- final String curICUVersion = ICU.getIcuVersion();
+ final String curICUVersion = getDeviceIcuVersion();
final String dbICUVersion = getProperty(DbProperties.ICU_VERSION,
"(unknown)");
if (!curICUVersion.equals(dbICUVersion)) {
@@ -2766,10 +2765,14 @@
return false;
}
+ private static String getDeviceIcuVersion() {
+ return VersionInfo.ICU_VERSION.toString();
+ }
+
private void upgradeLocaleData(SQLiteDatabase db, boolean rebuildSqliteStats) {
final LocaleSet locales = LocaleSet.newDefault();
Log.i(TAG, "Upgrading locale data for " + locales
- + " (ICU v" + ICU.getIcuVersion() + ")");
+ + " (ICU v" + getDeviceIcuVersion() + ")");
final long start = SystemClock.elapsedRealtime();
rebuildLocaleData(db, locales, rebuildSqliteStats);
Log.i(TAG, "Locale update completed in " + (SystemClock.elapsedRealtime() - start) + "ms");
@@ -2788,7 +2791,7 @@
FastScrollingIndexCache.getInstance(mContext).invalidate();
// Update the ICU version used to generate the locale derived data
// so we can tell when we need to rebuild with new ICU versions.
- PropertyUtils.setProperty(db, DbProperties.ICU_VERSION, ICU.getIcuVersion());
+ PropertyUtils.setProperty(db, DbProperties.ICU_VERSION, getDeviceIcuVersion());
PropertyUtils.setProperty(db, DbProperties.LOCALE, locales.toString());
}
@@ -2802,7 +2805,7 @@
return;
}
Log.i(TAG, "Switching to locale " + locales
- + " (ICU v" + ICU.getIcuVersion() + ")");
+ + " (ICU v" + getDeviceIcuVersion() + ")");
final long start = SystemClock.elapsedRealtime();
SQLiteDatabase db = getWritableDatabase();
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 54b4a27..bef38ea 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -62,7 +62,6 @@
import android.os.RemoteException;
import android.os.StrictMode;
import android.os.SystemClock;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.preference.PreferenceManager;
import android.provider.BaseColumns;
@@ -107,6 +106,7 @@
import android.provider.OpenableColumns;
import android.provider.Settings.Global;
import android.provider.SyncStateContract;
+import android.sysprop.ContactsProperties;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -291,22 +291,8 @@
private static final int AGGREGATION_ALGORITHM_NEW_VERSION = 5;
- private static final String AGGREGATE_CONTACTS = "sync.contacts.aggregate";
-
private static final String CONTACT_MEMORY_FILE_NAME = "contactAssetFile";
- /**
- * If set to "1", we don't remove account data when accounts have been removed.
- *
- * This should be used sparingly; even though there are data still available, the UI
- * don't know anything about them, so they won't show up in the contact filter screen, and
- * the contact card/editor may get confused to see unknown custom mimetypes.
- *
- * We can't spell it out because a property name must be less than 32 chars.
- */
- private static final String DEBUG_PROPERTY_KEEP_STALE_ACCOUNT_DATA =
- "debug.contacts.ksad";
-
public static final ProfileAwareUriMatcher sUriMatcher =
new ProfileAwareUriMatcher(UriMatcher.NO_MATCH);
@@ -1004,6 +990,8 @@
.add(PhoneLookup.TYPE, Phone.TYPE)
.add(PhoneLookup.LABEL, Phone.LABEL)
.add(PhoneLookup.NORMALIZED_NUMBER, Phone.NORMALIZED_NUMBER)
+ .add(Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME)
+ .add(Data.PREFERRED_PHONE_ACCOUNT_ID)
.build();
/** Contains the just the {@link Groups} columns */
@@ -1644,7 +1632,7 @@
createPhotoPriorityResolver(getContext()), mNameSplitter, mCommonNicknameCache)
: new ContactAggregator(this, mContactsHelper,
createPhotoPriorityResolver(getContext()), mNameSplitter, mCommonNicknameCache);
- mContactAggregator.setEnabled(SystemProperties.getBoolean(AGGREGATE_CONTACTS, true));
+ mContactAggregator.setEnabled(ContactsProperties.aggregate_contacts().orElse(true));
initDataRowHandlers(mDataRowHandlers, mContactsHelper, mContactAggregator,
mContactsPhotoStore);
}
@@ -1676,10 +1664,10 @@
: new ContactAggregator2(this, mContactsHelper,
createPhotoPriorityResolver(context), mNameSplitter, mCommonNicknameCache);
- mContactAggregator.setEnabled(SystemProperties.getBoolean(AGGREGATE_CONTACTS, true));
+ mContactAggregator.setEnabled(ContactsProperties.aggregate_contacts().orElse(true));
mProfileAggregator = new ProfileAggregator(this, mProfileHelper,
createPhotoPriorityResolver(context), mNameSplitter, mCommonNicknameCache);
- mProfileAggregator.setEnabled(SystemProperties.getBoolean(AGGREGATE_CONTACTS, true));
+ mProfileAggregator.setEnabled(ContactsProperties.aggregate_contacts().orElse(true));
mSearchIndexManager = new SearchIndexManager(this);
mContactsPhotoStore = new PhotoStore(getContext().getFilesDir(), mContactsHelper);
mProfilePhotoStore =
@@ -5232,9 +5220,8 @@
if (!haveAccountsChanged(systemAccounts)) {
return false;
}
- if ("1".equals(SystemProperties.get(DEBUG_PROPERTY_KEEP_STALE_ACCOUNT_DATA))) {
- Log.w(TAG, "Accounts changed, but not removing stale data for " +
- DEBUG_PROPERTY_KEEP_STALE_ACCOUNT_DATA);
+ if (ContactsProperties.keep_stale_account_data().orElse(false)) {
+ Log.w(TAG, "Accounts changed, but not removing stale data for debug.contacts.ksad");
return true;
}
Log.i(TAG, "Accounts changed");
diff --git a/src/com/android/providers/contacts/ContactsUpgradeReceiver.java b/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
index 6f50a14..c8816ac 100644
--- a/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
+++ b/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
@@ -16,6 +16,7 @@
package com.android.providers.contacts;
+import android.icu.util.VersionInfo;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -26,8 +27,6 @@
import android.os.RemoteException;
import android.util.Log;
-import libcore.icu.ICU;
-
/**
* This will be launched during system boot, after the core system has
* been brought up but before any non-persistent processes have been
@@ -56,7 +55,7 @@
final SharedPreferences prefs = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
final int prefDbVersion = prefs.getInt(PREF_DB_VERSION, 0);
- final String curIcuVersion = ICU.getIcuVersion();
+ final String curIcuVersion = VersionInfo.ICU_VERSION.toString();
final String curOsVersion = getOsVersionString();
final String prefIcuVersion = prefs.getString(PREF_ICU_VERSION, "");
diff --git a/src/com/android/providers/contacts/PhotoProcessor.java b/src/com/android/providers/contacts/PhotoProcessor.java
index b49e792..643d92d 100644
--- a/src/com/android/providers/contacts/PhotoProcessor.java
+++ b/src/com/android/providers/contacts/PhotoProcessor.java
@@ -22,7 +22,7 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
-import android.os.SystemProperties;
+import android.sysprop.ContactsProperties;
import com.android.providers.contacts.util.MemoryUtils;
import com.google.common.annotations.VisibleForTesting;
@@ -61,11 +61,10 @@
final boolean isExpensiveDevice =
MemoryUtils.getTotalMemorySize() >= PhotoSizes.LARGE_RAM_THRESHOLD;
- sMaxThumbnailDim = SystemProperties.getInt(
- PhotoSizes.SYS_PROPERTY_THUMBNAIL_SIZE, PhotoSizes.DEFAULT_THUMBNAIL);
+ sMaxThumbnailDim = ContactsProperties.thumbnail_size().orElse(
+ PhotoSizes.DEFAULT_THUMBNAIL);
- sMaxDisplayPhotoDim = SystemProperties.getInt(
- PhotoSizes.SYS_PROPERTY_DISPLAY_PHOTO_SIZE,
+ sMaxDisplayPhotoDim = ContactsProperties.display_photo_size().orElse(
isExpensiveDevice
? PhotoSizes.DEFAULT_DISPLAY_PHOTO_LARGE_MEMORY
: PhotoSizes.DEFAULT_DISPLAY_PHOTO_MEMORY_CONSTRAINED);
@@ -95,12 +94,6 @@
* photos
*/
public static final int LARGE_RAM_THRESHOLD = 640 * 1024 * 1024;
-
- /** If present, overrides the size given in {@link #DEFAULT_THUMBNAIL} */
- public static final String SYS_PROPERTY_THUMBNAIL_SIZE = "contacts.thumbnail_size";
-
- /** If present, overrides the size determined for the display photo */
- public static final String SYS_PROPERTY_DISPLAY_PHOTO_SIZE = "contacts.display_photo_size";
}
private final int mMaxDisplayPhotoDim;
diff --git a/test_common/Android.bp b/test_common/Android.bp
new file mode 100644
index 0000000..db2e709
--- /dev/null
+++ b/test_common/Android.bp
@@ -0,0 +1,23 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_library {
+ name: "ContactsProviderTestUtils",
+ srcs: ["src/**/*.java"],
+ libs: [
+ "android.test.runner",
+ "android-support-test",
+ "mockito-target-minus-junit4",
+ ],
+}
diff --git a/test_common/Android.mk b/test_common/Android.mk
deleted file mode 100644
index 2965f8a..0000000
--- a/test_common/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := \
- android.test.runner \
- android-support-test \
- mockito-target-minus-junit4
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ContactsProviderTestUtils
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..c687b63
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,22 @@
+android_test {
+ name: "ContactsProviderTests",
+ static_libs: [
+ "ContactsProviderTestUtils",
+ "android-support-test",
+ "mockito-target-minus-junit4",
+ ],
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ "android.test.mock",
+ ],
+ // Only compile source java files in this apk.
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ test_suites: ["device-tests"],
+ instrumentation_for: "ContactsProvider",
+ certificate: "shared",
+ optimize: {
+ enabled: false,
+ },
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 02ea81e..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- ContactsProviderTestUtils \
- android-support-test \
- mockito-target-minus-junit4
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ContactsProviderTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_INSTRUMENTATION_FOR := ContactsProvider
-LOCAL_CERTIFICATE := shared
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index f607846..93806e0 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -61,7 +61,7 @@
Voicemails.DIRTY,
Voicemails.DELETED};
/** Total number of columns exposed by call_log provider. */
- private static final int NUM_CALLLOG_FIELDS = 31;
+ private static final int NUM_CALLLOG_FIELDS = 34;
private CallLogProviderTestable mCallLogProvider;
@@ -202,8 +202,7 @@
values.put(Calls.NUMBER_PRESENTATION, Calls.PRESENTATION_ALLOWED);
values.put(Calls.DATE, 2000);
values.put(Calls.DURATION, 40);
- // Cached values should not be updated immediately by the framework when inserting the call.
- values.put(Calls.CACHED_NAME, (String) null);
+ values.put(Calls.CACHED_NAME, ci.name);
values.put(Calls.CACHED_NUMBER_TYPE, (String) null);
values.put(Calls.CACHED_NUMBER_LABEL, (String) null);
values.put(Calls.COUNTRY_ISO, "us");
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 6c76709..068c1a4 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -743,6 +743,8 @@
PhoneLookup.TYPE,
PhoneLookup.LABEL,
PhoneLookup.NORMALIZED_NUMBER,
+ Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+ Data.PREFERRED_PHONE_ACCOUNT_ID,
});
}
@@ -777,6 +779,8 @@
PhoneLookup.TYPE,
PhoneLookup.LABEL,
PhoneLookup.NORMALIZED_NUMBER,
+ Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+ Data.PREFERRED_PHONE_ACCOUNT_ID,
});
}
diff --git a/tests2/Android.bp b/tests2/Android.bp
new file mode 100644
index 0000000..b214ac0
--- /dev/null
+++ b/tests2/Android.bp
@@ -0,0 +1,36 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+android_test {
+ name: "ContactsProviderTests2",
+ static_libs: [
+ "ContactsProviderTestUtils",
+ "android-support-test",
+ "mockito-target-minus-junit4",
+ ],
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ test_suites: ["device-tests"],
+ instrumentation_for: "ContactsProvider",
+ certificate: "shared",
+ optimize: {
+ enabled: false,
+ },
+}
diff --git a/tests2/Android.mk b/tests2/Android.mk
deleted file mode 100644
index 4ba0a12..0000000
--- a/tests2/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- ContactsProviderTestUtils \
- android-support-test \
- mockito-target-minus-junit4
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ContactsProviderTests2
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_INSTRUMENTATION_FOR := ContactsProvider
-LOCAL_CERTIFICATE := shared
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)