summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-21 20:02:28 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-05-21 20:02:28 +0000
commit05acaeca94075a829aa703da4a1130e793690b8a (patch)
tree6d8dbf5b2a379cf7fd5e84047188f835c1bb5e13
parent8a116f495032d012479fbbaf12b280d1cbeb5a67 (diff)
parent08f71f5bb4dff48cdb94296c56c889f21568ad7b (diff)
downloadCallLogProvider-05acaeca94075a829aa703da4a1130e793690b8a.tar.gz
Snap for 4794708 from 08f71f5bb4dff48cdb94296c56c889f21568ad7b to sdk-release
Change-Id: Ifcb779ce26e5d11c1441466b2b0f7f276e299d28
-rw-r--r--Android.mk1
-rw-r--r--src/com/android/calllogbackup/CallLogBackupAgent.java4
-rw-r--r--tests/Android.mk1
3 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 159106a..0191d87 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.calllogbackup.*
LOCAL_PACKAGE_NAME := CallLogBackup
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := shared
LOCAL_PRIVILEGED_MODULE := true
diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index 6056f48..5a36c02 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -181,7 +181,7 @@ public class CallLogBackupAgent extends BackupAgent {
while (data.readNextHeader()) {
Call call = readCallFromData(data);
- if (call != null) {
+ if (call != null && call.type != Calls.VOICEMAIL_TYPE) {
writeCallToProvider(call);
if (isDebug()) {
Log.d(TAG, "Restored call: " + call);
@@ -238,7 +238,7 @@ public class CallLogBackupAgent extends BackupAgent {
try {
while (cursor.moveToNext()) {
Call call = readCallFromCursor(cursor);
- if (call != null) {
+ if (call != null && call.type != Calls.VOICEMAIL_TYPE) {
calls.add(call);
}
}
diff --git a/tests/Android.mk b/tests/Android.mk
index 0edf0c9..58b4cb0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -12,6 +12,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CallLogBackupTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_INSTRUMENTATION_FOR := CallLogBackup
LOCAL_CERTIFICATE := shared