Remove CallLogBackupAgent.
Moved to CallLogBackup.apk
Change-Id: I1aee3bb1dc4378bff0d346d424692bc60b3fdc40
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc8ddea..9142b72 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,6 +13,7 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+ <uses-permission android:name="android.permission.SEND_CALL_LOG_CHANGE" />
<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_PROFILE" />
@@ -20,13 +21,15 @@
<uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
<uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
+ <permission
+ android:name="android.permission.SEND_CALL_LOG_CHANGE"
+ android:label="Broadcast that a change happened to the call log."
+ android:protectionLevel="signature|system"/>
+
<application android:process="android.process.acore"
android:label="@string/app_label"
android:icon="@drawable/app_icon"
- android:backupAgent="CallLogBackupAgent">
-
- <meta-data android:name="com.google.android.backup.api_key"
- android:value="AEdPqrEAAAAI0N64ZsWbwY3WiVlfYvjLWRVpOrAOl9xKHkraxA" />
+ android:allowBackup="false">
<provider android:name="ContactsProvider2"
android:authorities="contacts;com.android.contacts"
diff --git a/src/com/android/providers/contacts/CallLogBackupAgent.java b/src/com/android/providers/contacts/CallLogBackupAgent.java
deleted file mode 100644
index 6de5a5e..0000000
--- a/src/com/android/providers/contacts/CallLogBackupAgent.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright (C) 2015 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
- */
-
-package com.android.providers.contacts;
-
-import android.app.backup.BackupAgent;
-import android.app.backup.BackupDataInput;
-import android.app.backup.BackupDataOutput;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.os.ParcelFileDescriptor;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.annotations.VisibleForTesting;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * Call log backup agent.
- */
-public class CallLogBackupAgent extends BackupAgent {
-
- @VisibleForTesting
- static class CallLogBackupState {
- int version;
- SortedSet<Integer> callIds;
- }
-
- @VisibleForTesting
- static class Call {
- int id;
- long date;
- long duration;
- String number;
- int type;
- int numberPresentation;
- String accountComponentName;
- String accountId;
- String accountAddress;
- Long dataUsage;
- int features;
-
- @Override
- public String toString() {
- if (isDebug()) {
- return "[" + id + ", account: [" + accountComponentName + " : " + accountId +
- "]," + number + ", " + date + "]";
- } else {
- return "[" + id + "]";
- }
- }
- }
-
- private static final String TAG = "CallLogBackupAgent";
-
- /** Current version of CallLogBackup. Used to track the backup format. */
- @VisibleForTesting
- static final int VERSION = 1002;
- /** Version indicating that there exists no previous backup entry. */
- @VisibleForTesting
- static final int VERSION_NO_PREVIOUS_STATE = 0;
-
- private static final String[] CALL_LOG_PROJECTION = new String[] {
- CallLog.Calls._ID,
- CallLog.Calls.DATE,
- CallLog.Calls.DURATION,
- CallLog.Calls.NUMBER,
- CallLog.Calls.TYPE,
- CallLog.Calls.COUNTRY_ISO,
- CallLog.Calls.GEOCODED_LOCATION,
- CallLog.Calls.NUMBER_PRESENTATION,
- CallLog.Calls.PHONE_ACCOUNT_COMPONENT_NAME,
- CallLog.Calls.PHONE_ACCOUNT_ID,
- CallLog.Calls.PHONE_ACCOUNT_ADDRESS,
- CallLog.Calls.DATA_USAGE,
- CallLog.Calls.FEATURES
- };
-
- /** ${inheritDoc} */
- @Override
- public void onBackup(ParcelFileDescriptor oldStateDescriptor, BackupDataOutput data,
- ParcelFileDescriptor newStateDescriptor) throws IOException {
-
- // Get the list of the previous calls IDs which were backed up.
- DataInputStream dataInput = new DataInputStream(
- new FileInputStream(oldStateDescriptor.getFileDescriptor()));
- final CallLogBackupState state;
- try {
- state = readState(dataInput);
- } finally {
- dataInput.close();
- }
-
- // Run the actual backup of data
- runBackup(state, data, getAllCallLogEntries());
-
- // Rewrite the backup state.
- DataOutputStream dataOutput = new DataOutputStream(new BufferedOutputStream(
- new FileOutputStream(newStateDescriptor.getFileDescriptor())));
- try {
- writeState(dataOutput, state);
- } finally {
- dataOutput.close();
- }
- }
-
- /** ${inheritDoc} */
- @Override
- public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState)
- throws IOException {
- if (isDebug()) {
- Log.d(TAG, "Performing Restore");
- }
-
- while (data.readNextHeader()) {
- Call call = readCallFromData(data);
- if (call != null) {
- writeCallToProvider(call);
- if (isDebug()) {
- Log.d(TAG, "Restored call: " + call);
- }
- }
- }
- }
-
- @VisibleForTesting
- void runBackup(CallLogBackupState state, BackupDataOutput data, Iterable<Call> calls) {
- SortedSet<Integer> callsToRemove = new TreeSet<>(state.callIds);
-
- // Loop through all the call log entries to identify:
- // (1) new calls
- // (2) calls which have been deleted.
- for (Call call : calls) {
- if (!state.callIds.contains(call.id)) {
-
- if (isDebug()) {
- Log.d(TAG, "Adding call to backup: " + call);
- }
-
- // This call new (not in our list from the last backup), lets back it up.
- addCallToBackup(data, call);
- state.callIds.add(call.id);
- } else {
- // This call still exists in the current call log so delete it from the
- // "callsToRemove" set since we want to keep it.
- callsToRemove.remove(call.id);
- }
- }
-
- // Remove calls which no longer exist in the set.
- for (Integer i : callsToRemove) {
- if (isDebug()) {
- Log.d(TAG, "Removing call from backup: " + i);
- }
-
- removeCallFromBackup(data, i);
- state.callIds.remove(i);
- }
- }
-
- private Iterable<Call> getAllCallLogEntries() {
- List<Call> calls = new LinkedList<>();
-
- // We use the API here instead of querying ContactsDatabaseHelper directly because
- // CallLogProvider has special locks in place for sychronizing when to read. Using the APIs
- // gives us that for free.
- ContentResolver resolver = getContentResolver();
- Cursor cursor = resolver.query(CallLog.Calls.CONTENT_URI, CALL_LOG_PROJECTION, null, null, null);
- if (cursor != null) {
- try {
- while (cursor.moveToNext()) {
- Call call = readCallFromCursor(cursor);
- if (call != null) {
- calls.add(call);
- }
- }
- } finally {
- cursor.close();
- }
- }
-
- return calls;
- }
-
- private void writeCallToProvider(Call call) {
- Long dataUsage = call.dataUsage == 0 ? null : call.dataUsage;
-
- PhoneAccountHandle 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 */);
- }
-
- @VisibleForTesting
- CallLogBackupState readState(DataInput dataInput) throws IOException {
- CallLogBackupState state = new CallLogBackupState();
- state.callIds = new TreeSet<>();
-
- try {
- // Read the version.
- state.version = dataInput.readInt();
-
- if (state.version >= 1) {
- // Read the size.
- int size = dataInput.readInt();
-
- // Read all of the call IDs.
- for (int i = 0; i < size; i++) {
- state.callIds.add(dataInput.readInt());
- }
- }
- } catch (EOFException e) {
- state.version = VERSION_NO_PREVIOUS_STATE;
- }
-
- return state;
- }
-
- @VisibleForTesting
- void writeState(DataOutput dataOutput, CallLogBackupState state)
- throws IOException {
- // Write version first of all
- dataOutput.writeInt(VERSION);
-
- // [Version 1]
- // size + callIds
- dataOutput.writeInt(state.callIds.size());
- for (Integer i : state.callIds) {
- dataOutput.writeInt(i);
- }
- }
-
- @VisibleForTesting
- Call readCallFromData(BackupDataInput data) {
- final int callId;
- try {
- callId = Integer.parseInt(data.getKey());
- } catch (NumberFormatException e) {
- Log.e(TAG, "Unexpected key found in restore: " + data.getKey());
- return null;
- }
-
- try {
- byte [] byteArray = new byte[data.getDataSize()];
- data.readEntityData(byteArray, 0, byteArray.length);
- DataInputStream dataInput = new DataInputStream(new ByteArrayInputStream(byteArray));
-
- Call call = new Call();
- call.id = callId;
-
- int version = dataInput.readInt();
- if (version >= 1) {
- call.date = dataInput.readLong();
- call.duration = dataInput.readLong();
- call.number = readString(dataInput, version);
- call.type = dataInput.readInt();
- call.numberPresentation = dataInput.readInt();
- call.accountComponentName = readString(dataInput, version);
- call.accountId = readString(dataInput, version);
- call.accountAddress = readString(dataInput, version);
- call.dataUsage = dataInput.readLong();
- call.features = dataInput.readInt();
- }
-
- return call;
- } catch (IOException e) {
- Log.e(TAG, "Error reading call data for " + callId, e);
- return null;
- }
- }
-
- private Call readCallFromCursor(Cursor cursor) {
- Call call = new Call();
- call.id = cursor.getInt(cursor.getColumnIndex(CallLog.Calls._ID));
- 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.type = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE));
- call.numberPresentation =
- cursor.getInt(cursor.getColumnIndex(CallLog.Calls.NUMBER_PRESENTATION));
- call.accountComponentName =
- cursor.getString(cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_COMPONENT_NAME));
- call.accountId =
- cursor.getString(cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID));
- call.accountAddress =
- 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));
- return call;
- }
-
- private void addCallToBackup(BackupDataOutput output, Call call) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- DataOutputStream data = new DataOutputStream(baos);
-
- try {
- data.writeInt(VERSION);
- data.writeLong(call.date);
- data.writeLong(call.duration);
- writeString(data, call.number);
- data.writeInt(call.type);
- data.writeInt(call.numberPresentation);
- writeString(data, call.accountComponentName);
- writeString(data, call.accountId);
- writeString(data, call.accountAddress);
- data.writeLong(call.dataUsage == null ? 0 : call.dataUsage);
- data.writeInt(call.features);
- data.flush();
-
- output.writeEntityHeader(Integer.toString(call.id), baos.size());
- output.writeEntityData(baos.toByteArray(), baos.size());
-
- if (isDebug()) {
- Log.d(TAG, "Wrote call to backup: " + call + " with byte array: " + baos);
- }
- } catch (IOException e) {
- Log.e(TAG, "Failed to backup call: " + call, e);
- }
- }
-
- private void writeString(DataOutputStream data, String str) throws IOException {
- if (str == null) {
- data.writeBoolean(false);
- } else {
- data.writeBoolean(true);
- data.writeUTF(str);
- }
- }
-
- private String readString(DataInputStream data, int version) throws IOException {
- if (version == 1) {
- return data.readUTF();
- } else {
- if (data.readBoolean()) {
- return data.readUTF();
- } else {
- return null;
- }
- }
- }
-
- private void removeCallFromBackup(BackupDataOutput output, int callId) {
- try {
- output.writeEntityHeader(Integer.toString(callId), -1);
- } catch (IOException e) {
- Log.e(TAG, "Failed to remove call: " + callId, e);
- }
- }
-
- private static boolean isDebug() {
- return Log.isLoggable(TAG, Log.DEBUG);
- }
-}
diff --git a/src/com/android/providers/contacts/DbModifierWithNotification.java b/src/com/android/providers/contacts/DbModifierWithNotification.java
index 5ce41c4..4830999 100644
--- a/src/com/android/providers/contacts/DbModifierWithNotification.java
+++ b/src/com/android/providers/contacts/DbModifierWithNotification.java
@@ -20,7 +20,6 @@
import static android.Manifest.permission.ADD_VOICEMAIL;
import static android.Manifest.permission.READ_VOICEMAIL;
-import android.app.backup.BackupManager;
import android.content.ComponentName;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -74,7 +73,6 @@
private final boolean mIsCallsTable;
private final VoicemailPermissions mVoicemailPermissions;
- private BackupManager mBackupManager;
public DbModifierWithNotification(String tableName, SQLiteDatabase db, Context context) {
this(tableName, db, null, context);
@@ -91,7 +89,6 @@
mDb = db;
mInsertHelper = insertHelper;
mContext = context;
- mBackupManager = new BackupManager(context);
mBaseUri = mTableName.equals(Tables.VOICEMAIL_STATUS) ?
Status.CONTENT_URI : Voicemails.CONTENT_URI;
mIsCallsTable = mTableName.equals(Tables.CALLS);
@@ -128,7 +125,14 @@
private void notifyCallLogChange() {
mContext.getContentResolver().notifyChange(Calls.CONTENT_URI, null, false);
- mBackupManager.dataChanged();
+
+ Intent intent = new Intent("android.intent.action.CALL_LOG_CHANGE");
+ intent.setComponent(new ComponentName("com.android.providers.calllogbackup",
+ "com.android.providers.calllogbackup.CallLogChangeReceiver"));
+
+ if (!mContext.getPackageManager().queryBroadcastReceivers(intent, 0).isEmpty()) {
+ mContext.sendBroadcast(intent);
+ }
}
private void notifyVoicemailChangeOnInsert(Uri notificationUri, Set<String> packagesModified) {
diff --git a/tests/src/com/android/providers/contacts/CallLogBackupAgentTest.java b/tests/src/com/android/providers/contacts/CallLogBackupAgentTest.java
deleted file mode 100644
index ca9af91..0000000
--- a/tests/src/com/android/providers/contacts/CallLogBackupAgentTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-package com.android.providers.contacts;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.eq;
-
-import android.app.backup.BackupDataOutput;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.providers.contacts.CallLogBackupAgent.Call;
-import com.android.providers.contacts.CallLogBackupAgent.CallLogBackupState;
-
-import org.mockito.InOrder;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TreeSet;
-
-/**
- * Test cases for {@link com.android.providers.contacts.CallLogBackupAgent}
- */
-@SmallTest
-public class CallLogBackupAgentTest extends AndroidTestCase {
-
- @Mock DataInput mDataInput;
- @Mock DataOutput mDataOutput;
- @Mock BackupDataOutput mBackupDataOutput;
-
- CallLogBackupAgent mCallLogBackupAgent;
-
- MockitoHelper mMockitoHelper = new MockitoHelper();
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
- mMockitoHelper.setUp(getClass());
- // Since we're testing a system app, AppDataDirGuesser doesn't find our
- // cache dir, so set it explicitly.
- System.setProperty("dexmaker.dexcache", getContext().getCacheDir().toString());
-
- MockitoAnnotations.initMocks(this);
-
- mCallLogBackupAgent = new CallLogBackupAgent();
- }
-
- @Override
- public void tearDown() throws Exception {
- mMockitoHelper.tearDown();
- }
-
- public void testReadState_NoCall() throws Exception {
- when(mDataInput.readInt()).thenThrow(new EOFException());
-
- CallLogBackupState state = mCallLogBackupAgent.readState(mDataInput);
-
- assertEquals(state.version, CallLogBackupAgent.VERSION_NO_PREVIOUS_STATE);
- assertEquals(state.callIds.size(), 0);
- }
-
- public void testReadState_OneCall() throws Exception {
- when(mDataInput.readInt()).thenReturn(
- 1 /* version */,
- 1 /* size */,
- 101 /* call-ID */ );
-
- CallLogBackupState state = mCallLogBackupAgent.readState(mDataInput);
-
- assertEquals(1, state.version);
- assertEquals(1, state.callIds.size());
- assertTrue(state.callIds.contains(101));
- }
-
- public void testReadState_MultipleCalls() throws Exception {
- when(mDataInput.readInt()).thenReturn(
- 1 /* version */,
- 2 /* size */,
- 101 /* call-ID */,
- 102 /* call-ID */);
-
- CallLogBackupState state = mCallLogBackupAgent.readState(mDataInput);
-
- assertEquals(1, state.version);
- assertEquals(2, state.callIds.size());
- assertTrue(state.callIds.contains(101));
- assertTrue(state.callIds.contains(102));
- }
-
- public void testWriteState_NoCalls() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
-
- mCallLogBackupAgent.writeState(mDataOutput, state);
-
- InOrder inOrder = Mockito.inOrder(mDataOutput);
- inOrder.verify(mDataOutput).writeInt(CallLogBackupAgent.VERSION);
- inOrder.verify(mDataOutput).writeInt(0 /* size */);
- }
-
- public void testWriteState_OneCall() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- state.callIds.add(101);
-
- mCallLogBackupAgent.writeState(mDataOutput, state);
-
- InOrder inOrder = Mockito.inOrder(mDataOutput);
- inOrder.verify(mDataOutput).writeInt(CallLogBackupAgent.VERSION);
- inOrder.verify(mDataOutput).writeInt(1);
- inOrder.verify(mDataOutput).writeInt(101 /* call-ID */);
- }
-
- public void testWriteState_MultipleCalls() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- state.callIds.add(101);
- state.callIds.add(102);
- state.callIds.add(103);
-
- mCallLogBackupAgent.writeState(mDataOutput, state);
-
- InOrder inOrder = Mockito.inOrder(mDataOutput);
- inOrder.verify(mDataOutput).writeInt(CallLogBackupAgent.VERSION);
- inOrder.verify(mDataOutput).writeInt(3 /* size */);
- inOrder.verify(mDataOutput).writeInt(101 /* call-ID */);
- inOrder.verify(mDataOutput).writeInt(102 /* call-ID */);
- inOrder.verify(mDataOutput).writeInt(103 /* call-ID */);
- }
-
- public void testRunBackup_NoCalls() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- List<Call> calls = new LinkedList<>();
-
- mCallLogBackupAgent.runBackup(state, mBackupDataOutput, calls);
-
- Mockito.verifyNoMoreInteractions(mBackupDataOutput);
- }
-
- public void testRunBackup_OneNewCall() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- List<Call> calls = new LinkedList<>();
- calls.add(makeCall(101, 0L, 0L, "555-5555"));
- mCallLogBackupAgent.runBackup(state, mBackupDataOutput, calls);
-
- verify(mBackupDataOutput).writeEntityHeader(eq("101"), Matchers.anyInt());
- verify(mBackupDataOutput).writeEntityData((byte[]) Matchers.any(), Matchers.anyInt());
- }
-
- public void testRunBackup_MultipleCall() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- List<Call> calls = new LinkedList<>();
- calls.add(makeCall(101, 0L, 0L, "555-1234"));
- calls.add(makeCall(102, 0L, 0L, "555-5555"));
-
- mCallLogBackupAgent.runBackup(state, mBackupDataOutput, calls);
-
- InOrder inOrder = Mockito.inOrder(mBackupDataOutput);
- inOrder.verify(mBackupDataOutput).writeEntityHeader(eq("101"), Matchers.anyInt());
- inOrder.verify(mBackupDataOutput).
- writeEntityData((byte[]) Matchers.any(), Matchers.anyInt());
- inOrder.verify(mBackupDataOutput).writeEntityHeader(eq("102"), Matchers.anyInt());
- inOrder.verify(mBackupDataOutput).
- writeEntityData((byte[]) Matchers.any(), Matchers.anyInt());
- }
-
- public void testRunBackup_PartialMultipleCall() throws Exception {
- CallLogBackupState state = new CallLogBackupState();
-
- state.version = CallLogBackupAgent.VERSION;
- state.callIds = new TreeSet<>();
- state.callIds.add(101);
-
- List<Call> calls = new LinkedList<>();
- calls.add(makeCall(101, 0L, 0L, "555-1234"));
- calls.add(makeCall(102, 0L, 0L, "555-5555"));
-
- mCallLogBackupAgent.runBackup(state, mBackupDataOutput, calls);
-
- InOrder inOrder = Mockito.inOrder(mBackupDataOutput);
- inOrder.verify(mBackupDataOutput).writeEntityHeader(eq("102"), Matchers.anyInt());
- inOrder.verify(mBackupDataOutput).
- writeEntityData((byte[]) Matchers.any(), Matchers.anyInt());
- }
-
- private static Call makeCall(int id, long date, long duration, String number) {
- Call c = new Call();
- c.id = id;
- c.date = date;
- c.duration = duration;
- c.number = number;
- c.accountComponentName = "account-component";
- c.accountId = "account-id";
- return c;
- }
-
-}
diff --git a/tests/src/com/android/providers/contacts/MockitoHelper.java b/tests/src/com/android/providers/contacts/MockitoHelper.java
deleted file mode 100644
index 3f3f7f6..0000000
--- a/tests/src/com/android/providers/contacts/MockitoHelper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-package com.android.providers.contacts;
-
-import android.util.Log;
-
-/**
- * Helper for Mockito-based test cases.
- */
-public final class MockitoHelper {
- private static final String TAG = "MockitoHelper";
-
- private ClassLoader mOriginalClassLoader;
- private Thread mContextThread;
-
- /**
- * Creates a new helper, which in turn will set the context classloader so
- * it can load Mockito resources.
- *
- * @param packageClass test case class
- */
- public void setUp(Class<?> packageClass) throws Exception {
- // makes a copy of the context classloader
- mContextThread = Thread.currentThread();
- mOriginalClassLoader = mContextThread.getContextClassLoader();
- ClassLoader newClassLoader = packageClass.getClassLoader();
- Log.v(TAG, "Changing context classloader from " + mOriginalClassLoader
- + " to " + newClassLoader);
- mContextThread.setContextClassLoader(newClassLoader);
- }
-
- /**
- * Restores the context classloader to the previous value.
- */
- public void tearDown() throws Exception {
- Log.v(TAG, "Restoring context classloader to " + mOriginalClassLoader);
- mContextThread.setContextClassLoader(mOriginalClassLoader);
- }
-}