From 0ccdb420e23dbb8c78de0b5f54a86f3bea2b20e1 Mon Sep 17 00:00:00 2001 From: weijiaxu Date: Mon, 22 Jan 2018 11:30:19 -0800 Subject: Add simulator enriched call related to interfaces and stubs. Test: on a local Device. PiperOrigin-RevId: 182809258 Change-Id: Ic996a31437d4b07cb2c7372005fe8d797757dfc0 --- .../binary/aosp/AospDialerRootComponent.java | 2 ++ .../google/GoogleStubDialerRootComponent.java | 2 ++ .../dialer/simulator/SimulatorComponent.java | 2 ++ .../dialer/simulator/SimulatorEnrichedCall.java | 28 +++++++++++++++ .../dialer/simulator/impl/SimulatorImpl.java | 1 + .../simulator/stub/SimulatorEnrichedCallStub.java | 40 ++++++++++++++++++++++ .../stub/StubSimulatorEnrichedCallModule.java | 31 +++++++++++++++++ 7 files changed, 106 insertions(+) create mode 100644 java/com/android/dialer/simulator/SimulatorEnrichedCall.java create mode 100644 java/com/android/dialer/simulator/stub/SimulatorEnrichedCallStub.java create mode 100644 java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java index 474f6665c..7d277d4b3 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -30,6 +30,7 @@ import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.precall.impl.PreCallModule; 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.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; @@ -53,6 +54,7 @@ import javax.inject.Singleton; PreCallModule.class, SharedPrefConfigProviderModule.class, SimulatorModule.class, + StubSimulatorEnrichedCallModule.class, StorageModule.class, StubCallLocationModule.class, StubDuoModule.class, diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java index 12038b7fb..ff1b09db7 100644 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java @@ -30,6 +30,7 @@ import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule; import com.android.dialer.precall.impl.PreCallModule; 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.storage.StorageModule; import com.android.dialer.strictmode.impl.SystemStrictModeModule; @@ -59,6 +60,7 @@ import javax.inject.Singleton; SharedPrefConfigProviderModule.class, SimulatorModule.class, StorageModule.class, + StubSimulatorEnrichedCallModule.class, StubDuoModule.class, StubEnrichedCallModule.class, StubFeedbackModule.class, diff --git a/java/com/android/dialer/simulator/SimulatorComponent.java b/java/com/android/dialer/simulator/SimulatorComponent.java index dee188281..6fa3f0cb1 100644 --- a/java/com/android/dialer/simulator/SimulatorComponent.java +++ b/java/com/android/dialer/simulator/SimulatorComponent.java @@ -26,6 +26,8 @@ public abstract class SimulatorComponent { public abstract Simulator getSimulator(); + public abstract SimulatorEnrichedCall getSimulatorEnrichedCall(); + public abstract SimulatorConnectionsBank getSimulatorConnectionsBank(); public static SimulatorComponent get(Context context) { diff --git a/java/com/android/dialer/simulator/SimulatorEnrichedCall.java b/java/com/android/dialer/simulator/SimulatorEnrichedCall.java new file mode 100644 index 000000000..f6c8a6cd9 --- /dev/null +++ b/java/com/android/dialer/simulator/SimulatorEnrichedCall.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.simulator; + +import com.android.dialer.enrichedcall.EnrichedCallManager.StateChangedListener; + +/** Setup enriched calling environment for {@link Simulator}. */ +public interface SimulatorEnrichedCall extends StateChangedListener { + /** Setup a session for an incoming enriched call. */ + long setupIncomingEnrichedCall(String number); + + /** Setup a session for outgoing enriched call. */ + long setupOutgoingEnrichedCall(String number); +} diff --git a/java/com/android/dialer/simulator/impl/SimulatorImpl.java b/java/com/android/dialer/simulator/impl/SimulatorImpl.java index 41c234b0e..be8676392 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorImpl.java +++ b/java/com/android/dialer/simulator/impl/SimulatorImpl.java @@ -25,6 +25,7 @@ import javax.inject.Inject; /** The entry point for the simulator feature. */ final class SimulatorImpl implements Simulator { + @Inject public SimulatorImpl() {} diff --git a/java/com/android/dialer/simulator/stub/SimulatorEnrichedCallStub.java b/java/com/android/dialer/simulator/stub/SimulatorEnrichedCallStub.java new file mode 100644 index 000000000..056722fab --- /dev/null +++ b/java/com/android/dialer/simulator/stub/SimulatorEnrichedCallStub.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.simulator.stub; + +import com.android.dialer.simulator.SimulatorEnrichedCall; +import javax.inject.Inject; + +/** Stub implementation of {@link SimulatorEnrichedCall}. */ +public class SimulatorEnrichedCallStub implements SimulatorEnrichedCall { + + @Inject + public SimulatorEnrichedCallStub() {} + + @Override + public long setupIncomingEnrichedCall(String number) { + return -1; + } + + @Override + public long setupOutgoingEnrichedCall(String number) { + return -1; + } + + @Override + public void onEnrichedCallStateChanged() {} +} diff --git a/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java new file mode 100644 index 000000000..36314e7a9 --- /dev/null +++ b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.simulator.stub; + +import com.android.dialer.simulator.SimulatorEnrichedCall; +import dagger.Binds; +import dagger.Module; +import javax.inject.Singleton; + +/** Provides a stub instance of SimulatorEnrichedCall. */ +@Module +public abstract class StubSimulatorEnrichedCallModule { + @Binds + @Singleton + public abstract SimulatorEnrichedCall bindsSimulatorEnrichedCall( + SimulatorEnrichedCallStub simulatorEnrichedCall); +} -- cgit v1.2.3