commit 68383f6fb47cb1b0336c8ecc61723117edb1eed8
author Sebastien Hertz <shertz@google.com> Mon Apr 11 23:29:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 11 23:29:57 2016 +0000
tree d4449abb345880d7b08443f5795688643aa53d52
parent 7914bccda3fde840ae3a476baa9cf735ac962e46
parent 29943c6ce3720f0942a241c3bd8cb5f6ac31ed3b

Update code coverage filter am: 1fac97f
am: 29943c6

* commit '29943c6ce3720f0942a241c3bd8cb5f6ac31ed3b':
  Update code coverage filter

Change-Id: I2449639dc4610bc2ee369bb823ab84825e4557c6

src/com/android/calllogbackup/CallLogBackupAgent.java

diff --git a/src/com/android/calllogbackup/CallLogBackupAgent.java b/src/com/android/calllogbackup/CallLogBackupAgent.java
index a6f7c85..77ac82c 100644
--- a/src/com/android/calllogbackup/CallLogBackupAgent.java
+++ b/src/com/android/calllogbackup/CallLogBackupAgent.java
@@ -67,6 +67,8 @@
         long date;
         long duration;
         String number;
+        String postDialDigits = "";
+        String viaNumber = "";
         int type;
         int numberPresentation;
         String accountComponentName;
@@ -74,7 +76,7 @@
         String accountAddress;
         Long dataUsage;
         int features;
-
+        int addForAllUsers = 1;
         @Override
         public String toString() {
             if (isDebug()) {
@@ -102,7 +104,7 @@
 
     /** Current version of CallLogBackup. Used to track the backup format. */
     @VisibleForTesting
-    static final int VERSION = 1002;
+    static final int VERSION = 1005;
     /** Version indicating that there exists no previous backup entry. */
     @VisibleForTesting
     static final int VERSION_NO_PREVIOUS_STATE = 0;
@@ -119,6 +121,8 @@
         CallLog.Calls.DATE,
         CallLog.Calls.DURATION,
         CallLog.Calls.NUMBER,
+        CallLog.Calls.POST_DIAL_DIGITS,
+        CallLog.Calls.VIA_NUMBER,
         CallLog.Calls.TYPE,
         CallLog.Calls.COUNTRY_ISO,
         CallLog.Calls.GEOCODED_LOCATION,
@@ -127,7 +131,8 @@
         CallLog.Calls.PHONE_ACCOUNT_ID,
         CallLog.Calls.PHONE_ACCOUNT_ADDRESS,
         CallLog.Calls.DATA_USAGE,
-        CallLog.Calls.FEATURES
+        CallLog.Calls.FEATURES,
+        CallLog.Calls.ADD_FOR_ALL_USERS,
     };
 
     /** ${inheritDoc} */
@@ -259,9 +264,11 @@
             handle = new PhoneAccountHandle(
                     ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
         }
-        Calls.addCall(null /* CallerInfo */, this, call.number, call.numberPresentation, call.type,
-                call.features, handle, call.date, (int) call.duration,
-                dataUsage, true /* addForAllUsers */, true /* is_read */);
+        boolean addForAllUsers = call.addForAllUsers == 1;
+        // We backup the calllog in the user running this backup agent, so write calls to this user.
+        Calls.addCall(null /* CallerInfo */, this, call.number, call.postDialDigits, call.viaNumber,
+                call.numberPresentation, call.type, call.features, handle, call.date,
+                (int) call.duration, dataUsage, addForAllUsers, null, true /* is_read */);
     }
 
     @VisibleForTesting
@@ -350,6 +357,18 @@
                 }
             }
 
+            if (version >= 1003) {
+                call.addForAllUsers = dataInput.readInt();
+            }
+
+            if (version >= 1004) {
+                call.postDialDigits = readString(dataInput);
+            }
+
+            if(version >= 1005) {
+                call.viaNumber = readString(dataInput);
+            }
+
             return call;
         } catch (IOException e) {
             Log.e(TAG, "Error reading call data for " + callId, e);
@@ -363,6 +382,9 @@
         call.date = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATE));
         call.duration = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DURATION));
         call.number = cursor.getString(cursor.getColumnIndex(CallLog.Calls.NUMBER));
+        call.postDialDigits = cursor.getString(
+                cursor.getColumnIndex(CallLog.Calls.POST_DIAL_DIGITS));
+        call.viaNumber = cursor.getString(cursor.getColumnIndex(CallLog.Calls.VIA_NUMBER));
         call.type = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE));
         call.numberPresentation =
                 cursor.getInt(cursor.getColumnIndex(CallLog.Calls.NUMBER_PRESENTATION));
@@ -374,6 +396,7 @@
                 cursor.getString(cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ADDRESS));
         call.dataUsage = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATA_USAGE));
         call.features = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.FEATURES));
+        call.addForAllUsers = cursor.getInt(cursor.getColumnIndex(Calls.ADD_FOR_ALL_USERS));
         return call;
     }
 
@@ -400,6 +423,12 @@
             data.write(oemData.bytes);
             data.writeInt(END_OEM_DATA_MARKER);
 
+            data.writeInt(call.addForAllUsers);
+
+            writeString(data, call.postDialDigits);
+
+            writeString(data, call.viaNumber);
+
             data.flush();
 
             output.writeEntityHeader(Integer.toString(call.id), baos.size());