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

Commit 14fd8f3d authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Dynamic InCallService switching." into nyc-dev

parents fdafb795 501b9b37

src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
 * 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.server.telecom;

 */

package com.android.server.telecom;



import com.android.internal.telephony.CallerInfoAsyncQuery;

src/com/android/server/telecom/CallsManager.java

+5 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.internal.telephony.AsyncEmergencyContactNotifier; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.telecom.TelecomServiceImpl.DefaultDialerManagerAdapter;

import com.android.server.telecom.components.ErrorDialogActivity;



import java.util.Collection;
@@ -200,7 +201,8 @@ public class CallsManager extends Call.ListenerBase 
            CallAudioManager.AudioServiceFactory audioServiceFactory,

            BluetoothManager bluetoothManager,

            WiredHeadsetManager wiredHeadsetManager,

            SystemStateProvider systemStateProvider) {

            SystemStateProvider systemStateProvider,

            DefaultDialerManagerAdapter defaultDialerAdapter) {

        mContext = context;

        mLock = lock;

        mContactsAsyncHelper = contactsAsyncHelper;
@@ -238,7 +240,8 @@ public class CallsManager extends Call.ListenerBase 
        RingtoneFactory ringtoneFactory = new RingtoneFactory(this, context);

        SystemVibrator systemVibrator = new SystemVibrator(context);

        AsyncRingtonePlayer asyncRingtonePlayer = new AsyncRingtonePlayer();

        mInCallController = new InCallController(context, mLock, this, systemStateProvider);

        mInCallController = new InCallController(

                context, mLock, this, systemStateProvider, defaultDialerAdapter);

        mRinger = new Ringer(playerFactory, context, systemSettingsUtil, asyncRingtonePlayer,

                ringtoneFactory, systemVibrator, mInCallController);

src/com/android/server/telecom/InCallController.java

+438 −184

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/server/telecom/Log.java

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class Log { 
        public static final String REMOTELY_HELD = "REMOTELY_HELD";

        public static final String REMOTELY_UNHELD = "REMOTELY_UNHELD";

        public static final String PULL = "PULL";

        public static final String INFO = "INFO";



        /**

         * Maps from a request to a response.  The same event could be listed as the

src/com/android/server/telecom/TelecomServiceImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import java.util.List; 
public class TelecomServiceImpl {

    public interface DefaultDialerManagerAdapter {

        String getDefaultDialerApplication(Context context);

        String getDefaultDialerApplication(Context context, int userId);

        boolean setDefaultDialerApplication(Context context, String packageName);

        boolean isDefaultOrSystemDialer(Context context, String packageName);

    }
@@ -77,6 +78,11 @@ public class TelecomServiceImpl { 
            return DefaultDialerManager.getDefaultDialerApplication(context);

        }



        @Override

        public String getDefaultDialerApplication(Context context, int userId) {

            return DefaultDialerManager.getDefaultDialerApplication(context, userId);

        }



        @Override

        public boolean setDefaultDialerApplication(Context context, String packageName) {

            return DefaultDialerManager.setDefaultDialerApplication(context, packageName);