Remove call log and sms permissions

Bug: 120483108
Test: Manual https://photos.app.goo.gl/ZkM7eyqoexYEnVzk6
Change-Id: I98f3f29c9d6da0dda1db974e599d369a5959a8c5

5 files changed, 1 insertions, 192 deletions

diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
index b8eccd702..fac9c858f 100644
--- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
+++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
@@ -32,7 +32,6 @@ import org.junit.runner.RunWith;
  * $ adb shell pm revoke com.android.contacts android.permission.WRITE_CONTACTS
  * $ adb shell pm revoke com.android.contacts android.permission.GET_ACCOUNTS
  * $ adb shell pm revoke com.android.contacts android.permission.READ_PHONE_STATE
- * $ adb shell pm revoke com.android.contacts android.permission.READ_CALL_LOG
  * $ adb shell pm revoke com.android.contacts android.permission.CALL_PHONE
  * $ adb shell am instrument -w \
  *     com.google.android.contacts.tests/androidx.test.runner.AndroidJUnitRunner \
@@ -54,7 +53,6 @@ public class NoPermissionsLaunchSmokeTest {
         assumeTrue(!hasPermission(mTargetContext, Manifest.permission.WRITE_CONTACTS));
         assumeTrue(!hasPermission(mTargetContext, Manifest.permission.GET_ACCOUNTS));
         assumeTrue(!hasPermission(mTargetContext, Manifest.permission.READ_PHONE_STATE));
-        assumeTrue(!hasPermission(mTargetContext, Manifest.permission.READ_CALL_LOG));
         assumeTrue(!hasPermission(mTargetContext, Manifest.permission.CALL_PHONE));
 
         // remove state that might exist outside of the app
diff --git a/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java b/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java
deleted file mode 100644
index b51affd44..000000000
--- a/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.android.contacts.interactions;
-
-import android.content.ContentValues;
-import android.provider.CallLog.Calls;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Tests {@link CallLogInteractionsLoader}
- */
-@SmallTest
-public class CallLogInteractionsLoaderTest extends AndroidTestCase {
-
-    public void testCallLogInteractions_pruneDuplicates_containsDuplicates() {
-        List<ContactInteraction> interactions = new ArrayList<>();
-        int maxToRetrieve = 5;
-
-        ContentValues interactionOneValues = new ContentValues();
-        interactionOneValues.put(Calls.DATE, 1L);
-        interactions.add(new CallLogInteraction(interactionOneValues));
-
-        ContentValues interactionTwoValues = new ContentValues();
-        interactionTwoValues.put(Calls.DATE, 1L);
-        interactions.add(new CallLogInteraction(interactionTwoValues));
-
-        interactions = CallLogInteractionsLoader.pruneDuplicateCallLogInteractions(interactions,
-                maxToRetrieve);
-        assertEquals(1, interactions.size());
-    }
-
-    public void testCallLogInteractions_pruneDuplicates_containsNoDuplicates() {
-        List<ContactInteraction> interactions = new ArrayList<>();
-        int maxToRetrieve = 5;
-
-        ContentValues interactionOneValues = new ContentValues();
-        interactionOneValues.put(Calls.DATE, 1L);
-        interactions.add(new CallLogInteraction(interactionOneValues));
-
-        ContentValues interactionTwoValues = new ContentValues();
-        interactionTwoValues.put(Calls.DATE, 5L);
-        interactions.add(new CallLogInteraction(interactionTwoValues));
-
-        interactions = CallLogInteractionsLoader.pruneDuplicateCallLogInteractions(interactions,
-                maxToRetrieve);
-        assertEquals(2, interactions.size());
-    }
-
-    public void testCallLogInteractions_maxToRetrieve() {
-        List<ContactInteraction> interactions = new ArrayList<>();
-        int maxToRetrieve = 1;
-
-        ContentValues interactionOneValues = new ContentValues();
-        interactionOneValues.put(Calls.DATE, 1L);
-        interactions.add(new CallLogInteraction(interactionOneValues));
-
-        ContentValues interactionTwoValues = new ContentValues();
-        interactionTwoValues.put(Calls.DATE, 5L);
-        interactions.add(new CallLogInteraction(interactionTwoValues));
-
-        interactions = CallLogInteractionsLoader.pruneDuplicateCallLogInteractions(interactions,
-                maxToRetrieve);
-        assertEquals(1, interactions.size());
-    }
-}
diff --git a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
index 5f95a1b0d..654533b63 100644
--- a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
@@ -15,11 +15,8 @@
  */
 package com.android.contacts.interactions;
 
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-
 import java.util.Calendar;
 import java.util.Locale;
 
@@ -28,26 +25,6 @@ import java.util.Locale;
  */
 @SmallTest
 public class ContactInteractionUtilTest extends AndroidTestCase {
-
-    private Locale mOriginalLocale;
-    private Calendar calendar;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        calendar = Calendar.getInstance();
-
-        // Time/Date utilities rely on specific locales. Forace US and set back in tearDown()
-        mOriginalLocale = Locale.getDefault();
-        setLocale(Locale.US);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        setLocale(mOriginalLocale);
-        super.tearDown();
-    }
-
     public void testOneQuestionMark() {
         assertEquals("(?)", ContactInteractionUtil.questionMarks(1));
     }
@@ -59,69 +36,4 @@ public class ContactInteractionUtilTest extends AndroidTestCase {
     public void testFiveQuestionMarks() {
         assertEquals("(?,?,?,?,?)", ContactInteractionUtil.questionMarks(5));
     }
-
-    public void testFormatDateStringFromTimestamp_todaySingleMinuteAm() {
-        // Test today scenario (time shown)
-        // Single digit minute & AM
-        calendar.set(Calendar.HOUR_OF_DAY, 8);
-        calendar.set(Calendar.MINUTE, 8);
-        long todayTimestamp = calendar.getTimeInMillis();
-        assertEquals("8:08 AM", ContactInteractionUtil.formatDateStringFromTimestamp(
-                calendar.getTimeInMillis(), getContext()));
-    }
-
-    public void testFormatDateStringFromTimestamp_todayDoubleMinutePm() {
-        // Double digit minute & PM
-        calendar.set(Calendar.HOUR_OF_DAY, 22);
-        calendar.set(Calendar.MINUTE, 18);
-        assertEquals("10:18 PM",
-                ContactInteractionUtil.formatDateStringFromTimestamp(calendar.getTimeInMillis(),
-                        getContext()));
-    }
-
-    public void testFormatDateStringFromTimestamp_other() {
-        // Test other (Month Date)
-        calendar.set(
-                /* year = */ 1991,
-                /* month = */ Calendar.MONTH,
-                /* day = */ 11,
-                /* hourOfDay = */ 8,
-                /* minute = */ 8);
-        assertEquals("Monday, March 11, 1991, 8:08 AM",
-                ContactInteractionUtil.formatDateStringFromTimestamp(calendar.getTimeInMillis(),
-                        getContext()));
-    }
-
-    public void testFormatDuration_zero() {
-        assertEquals("0 sec",
-                ContactInteractionUtil.formatDuration(0, getContext()));
-    }
-
-    public void testFormatDuration_minZeroSec() {
-        assertEquals("1 min 0 sec",
-                ContactInteractionUtil.formatDuration(60, getContext()));
-    }
-
-    public void testFormatDuration_minSec() {
-        assertEquals("30 min 9 sec",
-                ContactInteractionUtil.formatDuration(1809, getContext()));
-    }
-
-    public void testFormatDuration_hrZeroMinZeroSec() {
-        assertEquals("1 hr 0 min 0 sec",
-                ContactInteractionUtil.formatDuration(3600, getContext()));
-    }
-
-    public void testFormatDuration_hrMinSec() {
-        assertEquals("2 hr 44 min 36 sec",
-                ContactInteractionUtil.formatDuration(9876, getContext()));
-    }
-
-    private void setLocale(Locale locale) {
-        Locale.setDefault(locale);
-        Resources res = getContext().getResources();
-        Configuration config = res.getConfiguration();
-        config.locale = locale;
-        res.updateConfiguration(config, res.getDisplayMetrics());
-    }
 }
\ No newline at end of file
diff --git a/tests/src/com/android/contacts/interactions/TestLoaderManager.java b/tests/src/com/android/contacts/interactions/TestLoaderManager.java
index dacf61629..7a3dbe3b6 100644
--- a/tests/src/com/android/contacts/interactions/TestLoaderManager.java
+++ b/tests/src/com/android/contacts/interactions/TestLoaderManager.java
@@ -111,7 +111,7 @@ public class TestLoaderManager extends TestLoaderManagerBase {
                 @Override
                 public void run() {
                     try {
-                        AsyncTaskLoader.class.getMethod("waitForLoader").invoke(loader, null);
+                        AsyncTaskLoader.class.getMethod("waitForLoader").invoke(loader);
                     } catch (Throwable e) {
                         Log.e(TAG, "Exception while waiting for loader: " + loader.getId(), e);
                         Assert.fail("Exception while waiting for loader: " + loader.getId());
diff --git a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
index 88c9e29a2..150321505 100644
--- a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
+++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
@@ -57,40 +57,6 @@ public class ContactDisplayUtilTests extends AndroidTestCase {
         assertFalse(ContactDisplayUtils.isCustomPhoneType(Phone.TYPE_OTHER));
     }
 
-    public void testGetLabelForCallOrSmsReturnsCustomLabel() {
-        final CharSequence smsResult = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_CUSTOM,
-                "expected sms label", ContactDisplayUtils.INTERACTION_SMS, getContext());
-        assertEquals("expected sms label", smsResult);
-
-        final CharSequence callResult = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_CUSTOM,
-                "expected call label", ContactDisplayUtils.INTERACTION_CALL, getContext());
-        assertEquals("expected call label", callResult);
-    }
-
-    public void testGetLabelForCallOrSmsReturnsCallLabels() {
-        CharSequence result = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_HOME, "",
-                ContactDisplayUtils.INTERACTION_CALL, getContext());
-        CharSequence expected = getContext().getResources().getText(R.string.call_home);
-        assertEquals(expected, result);
-
-        result = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_MOBILE, "",
-                ContactDisplayUtils.INTERACTION_CALL, getContext());
-        expected = getContext().getResources().getText(R.string.call_mobile);
-        assertEquals(expected, result);
-    }
-
-    public void testGetLabelForCallOrSmsReturnsSmsLabels() {
-        CharSequence result = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_HOME, "",
-                ContactDisplayUtils.INTERACTION_SMS, getContext());
-        CharSequence expected = getContext().getResources().getText(R.string.sms_home);
-        assertEquals(expected, result);
-
-        result = ContactDisplayUtils.getLabelForCallOrSms(Phone.TYPE_MOBILE, "",
-                ContactDisplayUtils.INTERACTION_SMS, getContext());
-        expected = getContext().getResources().getText(R.string.sms_mobile);
-        assertEquals(expected, result);
-    }
-
     public void testGetPhoneLabelResourceIdReturnsOther() {
         assertEquals(R.string.call_other, ContactDisplayUtils.getPhoneLabelResourceId(null));
     }