diff options
| -rw-r--r-- | proguard.flags | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/PhoneCallDetailsHelper.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogListItemViews.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallTypeIconsView.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/SmartDialNameMatcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/util/AsyncTaskExecutors.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/util/ExpirableCache.java | 2 | ||||
| -rw-r--r-- | tests/proguard.flags | 4 |
8 files changed, 9 insertions, 11 deletions
diff --git a/proguard.flags b/proguard.flags index 9e9ed6441..d7fefa72f 100644 --- a/proguard.flags +++ b/proguard.flags @@ -6,10 +6,10 @@ } # Any class or method annotated with NeededForTesting or NeededForReflection. --keep @com.android.contacts.test.NeededForTesting class * +-keep @com.android.contacts.common.test.NeededForTesting class * -keep @com.android.contacts.test.NeededForReflection class * -keepclassmembers class * { -@com.android.contacts.test.NeededForTesting *; +@com.android.contacts.common.test.NeededForTesting *; @com.android.contacts.test.NeededForReflection *; } diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index d8c522055..f8ca769fc 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -29,7 +29,7 @@ import android.text.style.StyleSpan; import android.view.View; import android.widget.TextView; -import com.android.contacts.test.NeededForTesting; +import com.android.contacts.common.test.NeededForTesting; import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.PhoneNumberHelper; diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java index d012f9ceb..86f531365 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViews.java +++ b/src/com/android/dialer/calllog/CallLogListItemViews.java @@ -22,7 +22,7 @@ import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.contacts.test.NeededForTesting; +import com.android.contacts.common.test.NeededForTesting; import com.android.dialer.PhoneCallDetailsViews; import com.android.dialer.R; diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java index b83c1493c..e83512861 100644 --- a/src/com/android/dialer/calllog/CallTypeIconsView.java +++ b/src/com/android/dialer/calllog/CallTypeIconsView.java @@ -23,7 +23,7 @@ import android.provider.CallLog.Calls; import android.util.AttributeSet; import android.view.View; -import com.android.contacts.test.NeededForTesting; +import com.android.contacts.common.test.NeededForTesting; import com.android.dialer.R; import com.google.common.collect.Lists; diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java index 1253a566d..53f564275 100644 --- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java +++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java @@ -19,8 +19,6 @@ package com.android.dialer.dialpad; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import com.android.contacts.test.NeededForTesting; - import java.text.Normalizer; import java.util.ArrayList; diff --git a/src/com/android/dialer/util/AsyncTaskExecutors.java b/src/com/android/dialer/util/AsyncTaskExecutors.java index 4f06e2889..322a435e3 100644 --- a/src/com/android/dialer/util/AsyncTaskExecutors.java +++ b/src/com/android/dialer/util/AsyncTaskExecutors.java @@ -19,7 +19,7 @@ package com.android.dialer.util; import android.os.AsyncTask; import android.os.Looper; -import com.android.contacts.test.NeededForTesting; +import com.android.contacts.common.test.NeededForTesting; import com.google.common.base.Preconditions; import java.util.concurrent.Executor; diff --git a/src/com/android/dialer/util/ExpirableCache.java b/src/com/android/dialer/util/ExpirableCache.java index 2b4e4393b..94ea6aa90 100644 --- a/src/com/android/dialer/util/ExpirableCache.java +++ b/src/com/android/dialer/util/ExpirableCache.java @@ -18,7 +18,7 @@ package com.android.dialer.util; import android.util.LruCache; -import com.android.contacts.test.NeededForTesting; +import com.android.contacts.common.test.NeededForTesting; import java.util.concurrent.atomic.AtomicInteger; diff --git a/tests/proguard.flags b/tests/proguard.flags index 39784b11b..3991a1452 100644 --- a/tests/proguard.flags +++ b/tests/proguard.flags @@ -10,10 +10,10 @@ } # Any class or method annotated with NeededForTesting or NeededForReflection. --keep @com.android.contacts.test.NeededForTesting class * +-keep @com.android.contacts.common.test.NeededForTesting class * -keep @com.android.contacts.test.NeededForReflection class * -keepclassmembers class * { -@com.android.contacts.test.NeededForTesting *; +@com.android.contacts.common.test.NeededForTesting *; @com.android.contacts.test.NeededForReflection *; } |