Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb8718b authored by Walter Jang's avatar Walter Jang
Browse files

Replace @NeededForTesting w/ proguard keep flags (1/2) 

* Replace -keep of entire c.a.c.common package
  with individual classes
* Remove all use of @NeededForTesting annotations
  (and the file itself since @VisibleForTesting
  accomplishes the same thing)

Test: Ran user build ContactsTests on Nexus 5 MOB30H

Bug: 30976481

Change-Id: I8d9a4d6b3409a159a108b39c1c4837a19e2325ca
parent 54b53a57

proguard.flags

+73 −11
Original line number Diff line number Diff line
@@ -13,8 +13,70 @@ 
-keep class com.google.android.libraries.material.featurehighlight.** { *; }



# Needed for tests

-keep class com.android.contacts.common.** { *;}

-keep class com.android.contacts.interactions.** { *;}

-keep class com.android.contacts.common.compat.CompatUtils { *; }

-keep class com.android.contacts.common.Collapser { *; }

-keep class com.android.contacts.common.ContactsUtils { *; }

-keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; }

-keep class com.android.contacts.common.format.FormatUtils { *; }

-keep class com.android.contacts.common.format.TextHighlighter { *; }

-keep class com.android.contacts.common.list.ContactListItemView { *; }

-keep class com.android.contacts.common.list.ContactsSectionIndexer { *; }

-keep class com.android.contacts.common.location.CountryDetector { *; }

-keep class com.android.contacts.common.model.account.AccountType { *; }

-keep class com.android.contacts.common.model.account.AccountType$* { *; }

-keep class com.android.contacts.common.model.account.AccountTypeWithDataSet { *; }

-keep class com.android.contacts.common.model.account.AccountWithDataSet { *; }

-keep class com.android.contacts.common.model.account.BaseAccountType { *; }

-keep class com.android.contacts.common.model.account.BaseAccountType$* { *; }

-keep class com.android.contacts.common.model.account.ExchangeAccountType { *; }

-keep class com.android.contacts.common.model.account.ExternalAccountType { *; }

-keep class com.android.contacts.common.model.account.FallbackAccountType { *; }

-keep class com.android.contacts.common.model.account.GoogleAccountType { *; }

-keep class com.android.contacts.common.model.AccountTypeManager { *; }

-keep class com.android.contacts.common.model.AccountTypeManagerImpl { *; }

-keep class com.android.contacts.common.model.BuilderWrapper { *; }

-keep class com.android.contacts.common.model.Contact { *; }

-keep class com.android.contacts.common.model.ContactLoader { *; }

-keep class com.android.contacts.common.model.CPOWrapper { *; }

-keep class com.android.contacts.common.model.dataitem.DataItem { *; }

-keep class com.android.contacts.common.model.dataitem.DataKind { *; }

-keep class com.android.contacts.common.model.dataitem.EmailDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.EventDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.ImDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.NicknameDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.NoteDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.OrganizationDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.PhoneDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.RelationDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.SipAddressDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.StructuredNameDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.StructuredPostalDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.WebsiteDataItem { *; }

-keep class com.android.contacts.common.model.RawContact { *; }

-keep class com.android.contacts.common.model.RawContactDelta { *; }

-keep class com.android.contacts.common.model.RawContactDeltaList { *; }

-keep class com.android.contacts.common.model.RawContactModifier { *; }

-keep class com.android.contacts.common.model.ValuesDelta { *; }

-keep class com.android.contacts.common.MoreContactUtils { *; }

-keep class com.android.contacts.common.preference.ContactsPreferences { *; }

-keep class com.android.contacts.common.testing.InjectedServices { *; }

-keep class com.android.contacts.common.util.BitmapUtil { *; }

-keep class com.android.contacts.common.util.ContactDisplayUtils { *; }

-keep class com.android.contacts.common.util.DateUtils { *; }

-keep class com.android.contacts.common.util.NameConverter { *; }

-keep class com.android.contacts.common.util.SearchUtil { *; }

-keep class com.android.contacts.common.util.SearchUtil$* { *; }

-keep class com.android.contacts.ContactsApplication { *; }

-keep class com.android.contacts.ContactSaveService { *; }

-keep class com.android.contacts.ContactSaveService$* { *; }

-keep class com.android.contacts.editor.ContactEditorUtils { *; }

-keep class com.android.contacts.editor.EditorUiUtils { *; }

-keep class com.android.contacts.group.GroupUtil { *; }

-keep class com.android.contacts.interactions.CallLogInteraction { *; }

-keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }

-keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }

-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }

-keep class com.android.contacts.widget.CompositeListAdapter { *; }

-keep class com.google.common.base.Objects { *; }

-keep class com.google.common.base.Preconditions { *; }

-keep class com.google.common.collect.ImmutableMap { *; }

src/com/android/contacts/ContactSaveService.java

+0 −9
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.contacts.common.model.RawContactDelta; 
import com.android.contacts.common.model.RawContactDeltaList;

import com.android.contacts.common.model.RawContactModifier;

import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.common.testing.NeededForTesting;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.contacts.compat.PinnedPositionsCompat;

import com.android.contacts.util.ContactPhotoUtils;
@@ -1644,7 +1643,6 @@ public class ContactSaveService extends IntentService { 
        }

    }



    @NeededForTesting

    public interface GroupsDao {

        Uri create(String title, AccountWithDataSet account);

        int delete(Uri groupUri);
@@ -1652,11 +1650,8 @@ public class ContactSaveService extends IntentService { 
        Uri undoDeletion(Bundle undoData);

    }



    @NeededForTesting

    public static class GroupsDaoImpl implements GroupsDao {

        @NeededForTesting

        public static final String KEY_GROUP_DATA = "groupData";

        @NeededForTesting

        public static final String KEY_GROUP_MEMBERS = "groupMemberIds";



        private static final String TAG = "GroupsDao";
@@ -1672,7 +1667,6 @@ public class ContactSaveService extends IntentService { 
            this.contentResolver = contentResolver;

        }



        @NeededForTesting

        public Bundle captureDeletionUndoData(Uri groupUri) {

            final long groupId = ContentUris.parseId(groupUri);

            final Bundle result = new Bundle();
@@ -1710,7 +1704,6 @@ public class ContactSaveService extends IntentService { 
            return result;

        }



        @NeededForTesting

        public Uri undoDeletion(Bundle deletedGroupData) {

            final ContentValues groupData = deletedGroupData.getParcelable(KEY_GROUP_DATA);

            if (groupData == null) {
@@ -1738,7 +1731,6 @@ public class ContactSaveService extends IntentService { 
            return groupUri;

        }



        @NeededForTesting

        public Uri create(String title, AccountWithDataSet account) {

            final ContentValues values = new ContentValues();

            values.put(Groups.TITLE, title);
@@ -1748,7 +1740,6 @@ public class ContactSaveService extends IntentService { 
            return contentResolver.insert(Groups.CONTENT_URI, values);

        }



        @NeededForTesting

        public int delete(Uri groupUri) {

            return contentResolver.delete(groupUri, null, null);

        }

src/com/android/contacts/ContactsApplication.java

+0 −2
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ import com.android.contacts.common.testing.InjectedServices; 
import com.android.contacts.common.util.Constants;

import com.android.contactsbind.analytics.AnalyticsUtil;



import com.android.contacts.common.testing.NeededForTesting;

import com.google.common.annotations.VisibleForTesting;



@NeededForTesting

public class ContactsApplication extends Application {

    private static final boolean ENABLE_LOADER_LOG = false; // Don't submit with true

    private static final boolean ENABLE_FRAGMENT_LOG = false; // Don't submit with true

src/com/android/contacts/common/ContactsUtils.java

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.util.Pair; 


import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.common.model.dataitem.ImDataItem;

import com.android.contacts.common.testing.NeededForTesting;

import com.android.contacts.common.compat.ContactsCompat;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.model.AccountTypeManager;
@@ -122,7 +121,6 @@ public class ContactsUtils { 
    /**

     * Returns true if two objects are considered equal.  Two null references are equal here.

     */

    @NeededForTesting

    public static boolean areObjectsEqual(Object a, Object b) {

        return a == b || (a != null && a.equals(b));

    }

src/com/android/contacts/common/location/CountryDetector.java

+0 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.Log;



import com.android.contacts.common.testing.NeededForTesting;



import java.util.Locale;



/**
@@ -62,7 +60,6 @@ public class CountryDetector { 
    /**

     * Factory method for {@link CountryDetector} that allows the caller to provide mock objects.

     */

    @NeededForTesting

    public CountryDetector getInstanceForTest(Context context, TelephonyManager telephonyManager,

            LocaleProvider localeProvider) {

        return new CountryDetector(context, telephonyManager, localeProvider);