diff options
| author | wangqi <wangqi@google.com> | 2018-05-14 15:26:49 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-05-15 11:16:09 -0700 |
| commit | 37b588d56db13b9c89d8ccd7dd799b0cbddb1b75 (patch) | |
| tree | 2e3d20ca643ecf7710cc3953ee843713cddf17c9 | |
| parent | d60767394d6742ccb5ade818510c979f351b4827 (diff) | |
Move SpamStub to separate package.
This is necessary to avoid potential conflict binding with spam/testing on auto generated components in tests.
Test: presubmit
PiperOrigin-RevId: 196577184
Change-Id: I2aac0df138b7efb62cdcc35b2a79ce889d001cd8
| -rw-r--r-- | java/com/android/dialer/binary/aosp/AospDialerRootComponent.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/spam/stub/SpamSettingsStub.java (renamed from java/com/android/dialer/spam/SpamSettingsStub.java) | 3 | ||||
| -rw-r--r-- | java/com/android/dialer/spam/stub/SpamStub.java (renamed from java/com/android/dialer/spam/SpamStub.java) | 3 | ||||
| -rw-r--r-- | java/com/android/dialer/spam/stub/StubSpamModule.java (renamed from java/com/android/dialer/spam/StubSpamModule.java) | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java index 6cbaf4fe7..8746b2bf1 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -37,7 +37,7 @@ import com.android.dialer.preferredsim.PreferredSimModule; import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule; -import com.android.dialer.spam.StubSpamModule; +import com.android.dialer.spam.stub.StubSpamModule; import com.android.dialer.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; import com.android.incallui.calllocation.stub.StubCallLocationModule; diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index f4f7a0a3b..62b8ca251 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -37,7 +37,7 @@ import com.android.dialer.preferredsim.PreferredSimModule; import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule; import com.android.dialer.simulator.impl.SimulatorModule; import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule; -import com.android.dialer.spam.StubSpamModule; +import com.android.dialer.spam.stub.StubSpamModule; import com.android.dialer.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; import com.android.incallui.calllocation.impl.CallLocationModule; diff --git a/java/com/android/dialer/spam/SpamSettingsStub.java b/java/com/android/dialer/spam/stub/SpamSettingsStub.java index 905daa45c..194d18451 100644 --- a/java/com/android/dialer/spam/SpamSettingsStub.java +++ b/java/com/android/dialer/spam/stub/SpamSettingsStub.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.android.dialer.spam; +package com.android.dialer.spam.stub; import android.content.Context; import android.content.Intent; +import com.android.dialer.spam.SpamSettings; import javax.inject.Inject; /** Default implementation of SpamSettings. */ diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/stub/SpamStub.java index 1ba9b76dd..5eeed4571 100644 --- a/java/com/android/dialer/spam/SpamStub.java +++ b/java/com/android/dialer/spam/stub/SpamStub.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.dialer.spam; +package com.android.dialer.spam.stub; import android.support.annotation.Nullable; import com.android.dialer.DialerPhoneNumber; @@ -22,6 +22,7 @@ import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; import com.android.dialer.logging.ContactLookupResult; import com.android.dialer.logging.ContactSource; import com.android.dialer.logging.ReportingLocation; +import com.android.dialer.spam.Spam; import com.android.dialer.spam.status.SimpleSpamStatus; import com.android.dialer.spam.status.SpamStatus; import com.google.common.collect.ImmutableMap; diff --git a/java/com/android/dialer/spam/StubSpamModule.java b/java/com/android/dialer/spam/stub/StubSpamModule.java index b60967475..e6b4622df 100644 --- a/java/com/android/dialer/spam/StubSpamModule.java +++ b/java/com/android/dialer/spam/stub/StubSpamModule.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package com.android.dialer.spam; +package com.android.dialer.spam.stub; import com.android.dialer.inject.DialerVariant; import com.android.dialer.inject.InstallIn; +import com.android.dialer.spam.Spam; +import com.android.dialer.spam.SpamSettings; import dagger.Binds; import dagger.Module; |