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

Commit 37b588d5 authored by wangqi's avatar wangqi Committed by Copybara-Service
Browse files

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
parent d6076739

java/com/android/dialer/binary/aosp/AospDialerRootComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

java/com/android/dialer/spam/SpamSettingsStub.java→java/com/android/dialer/spam/stub/SpamSettingsStub.java

+2 −1
Original line number Diff line number Diff line
@@ -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. */

java/com/android/dialer/spam/SpamStub.java→java/com/android/dialer/spam/stub/SpamStub.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

java/com/android/dialer/spam/StubSpamModule.java→java/com/android/dialer/spam/stub/StubSpamModule.java

+3 −1
Original line number Diff line number Diff line
@@ -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;