From 1019500220518fb5fb023fcb7d370ab3cbf12307 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 16 Mar 2017 11:07:39 -0700 Subject: Update dialer to tap green cl 150332012. Test: Treehugger Change-Id: If2baab1d3fc2dee602a4f784bba532182e7174f5 --- java/com/android/dialer/debug/AndroidManifest.xml | 3 - .../dialer/debug/bindings/impl/DebugBindings.java | 32 ------- .../dialer/debug/bindings/stub/DebugBindings.java | 27 ------ .../android/dialer/debug/impl/AndroidManifest.xml | 18 ---- .../android/dialer/debug/impl/DebugConnection.java | 55 ----------- .../dialer/debug/impl/DebugConnectionService.java | 103 --------------------- 6 files changed, 238 deletions(-) delete mode 100644 java/com/android/dialer/debug/AndroidManifest.xml delete mode 100644 java/com/android/dialer/debug/bindings/impl/DebugBindings.java delete mode 100644 java/com/android/dialer/debug/bindings/stub/DebugBindings.java delete mode 100644 java/com/android/dialer/debug/impl/AndroidManifest.xml delete mode 100644 java/com/android/dialer/debug/impl/DebugConnection.java delete mode 100644 java/com/android/dialer/debug/impl/DebugConnectionService.java (limited to 'java/com/android/dialer/debug') diff --git a/java/com/android/dialer/debug/AndroidManifest.xml b/java/com/android/dialer/debug/AndroidManifest.xml deleted file mode 100644 index 053d7e789..000000000 --- a/java/com/android/dialer/debug/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/java/com/android/dialer/debug/bindings/impl/DebugBindings.java b/java/com/android/dialer/debug/bindings/impl/DebugBindings.java deleted file mode 100644 index a8b44605c..000000000 --- a/java/com/android/dialer/debug/bindings/impl/DebugBindings.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2016 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.debug.bindings; - -import android.content.Context; -import com.android.dialer.debug.impl.DebugConnectionService; - -/** Hooks into the debug module. */ -public class DebugBindings { - - public static void registerConnectionService(Context context) { - DebugConnectionService.register(context); - } - - public static void addNewIncomingCall(Context context, String phoneNumber) { - DebugConnectionService.addNewIncomingCall(context, phoneNumber); - } -} diff --git a/java/com/android/dialer/debug/bindings/stub/DebugBindings.java b/java/com/android/dialer/debug/bindings/stub/DebugBindings.java deleted file mode 100644 index 7df38341d..000000000 --- a/java/com/android/dialer/debug/bindings/stub/DebugBindings.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2016 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.debug.bindings; - -import android.content.Context; - -/** Hooks into the debug module. */ -public class DebugBindings { - - public static void registerConnectionService(Context context) {} - - public static void addNewIncomingCall(Context context, String phoneNumber) {} -} diff --git a/java/com/android/dialer/debug/impl/AndroidManifest.xml b/java/com/android/dialer/debug/impl/AndroidManifest.xml deleted file mode 100644 index b8756614b..000000000 --- a/java/com/android/dialer/debug/impl/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/java/com/android/dialer/debug/impl/DebugConnection.java b/java/com/android/dialer/debug/impl/DebugConnection.java deleted file mode 100644 index 2ef83aa76..000000000 --- a/java/com/android/dialer/debug/impl/DebugConnection.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2016 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.debug.impl; - -import android.telecom.Connection; -import android.telecom.DisconnectCause; -import com.android.dialer.common.LogUtil; - -class DebugConnection extends Connection { - - @Override - public void onAnswer() { - LogUtil.i("DebugConnection.onAnswer", null); - setActive(); - } - - @Override - public void onReject() { - LogUtil.i("DebugConnection.onReject", null); - setDisconnected(new DisconnectCause(DisconnectCause.REJECTED)); - } - - @Override - public void onHold() { - LogUtil.i("DebugConnection.onHold", null); - setOnHold(); - } - - @Override - public void onUnhold() { - LogUtil.i("DebugConnection.onUnhold", null); - setActive(); - } - - @Override - public void onDisconnect() { - LogUtil.i("DebugConnection.onDisconnect", null); - setDisconnected(new DisconnectCause(DisconnectCause.LOCAL)); - destroy(); - } -} diff --git a/java/com/android/dialer/debug/impl/DebugConnectionService.java b/java/com/android/dialer/debug/impl/DebugConnectionService.java deleted file mode 100644 index 69aab1e13..000000000 --- a/java/com/android/dialer/debug/impl/DebugConnectionService.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2016 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.debug.impl; - -import android.content.ComponentName; -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.telecom.Connection; -import android.telecom.ConnectionRequest; -import android.telecom.ConnectionService; -import android.telecom.PhoneAccount; -import android.telecom.PhoneAccountHandle; -import android.telecom.TelecomManager; -import android.telephony.TelephonyManager; -import com.android.dialer.common.LogUtil; -import java.util.ArrayList; -import java.util.List; - -/** Simple connection provider to create an incoming call. This is useful for emulators. */ -public class DebugConnectionService extends ConnectionService { - - private static final String PHONE_ACCOUNT_ID = "DEBUG_DIALER"; - - public static void register(Context context) { - LogUtil.i( - "DebugConnectionService.register", - context.getSystemService(Context.TELECOM_SERVICE).toString()); - context.getSystemService(TelecomManager.class).registerPhoneAccount(buildPhoneAccount(context)); - } - - public static void addNewIncomingCall(Context context, String phoneNumber) { - LogUtil.i("DebugConnectionService.addNewIncomingCall", null); - Bundle bundle = new Bundle(); - bundle.putString(TelephonyManager.EXTRA_INCOMING_NUMBER, phoneNumber); - try { - context - .getSystemService(TelecomManager.class) - .addNewIncomingCall(getConnectionServiceHandle(context), bundle); - } catch (SecurityException e) { - LogUtil.i( - "DebugConnectionService.addNewIncomingCall", - "unable to add call. Make sure to enable the service in Phone app -> Settings -> Calls ->" - + " Calling accounts."); - } - } - - private static PhoneAccount buildPhoneAccount(Context context) { - PhoneAccount.Builder builder = - new PhoneAccount.Builder( - getConnectionServiceHandle(context), "DebugDialerConnectionService"); - List uriSchemes = new ArrayList<>(); - uriSchemes.add(PhoneAccount.SCHEME_TEL); - - return builder - .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) - .setShortDescription("Debug Dialer Connection Serivce") - .setSupportedUriSchemes(uriSchemes) - .build(); - } - - private static PhoneAccountHandle getConnectionServiceHandle(Context context) { - ComponentName componentName = new ComponentName(context, DebugConnectionService.class); - return new PhoneAccountHandle(componentName, PHONE_ACCOUNT_ID); - } - - private static Uri getPhoneNumber(ConnectionRequest request) { - String phoneNumber = request.getExtras().getString(TelephonyManager.EXTRA_INCOMING_NUMBER); - return Uri.fromParts(PhoneAccount.SCHEME_TEL, phoneNumber, null); - } - - @Override - public Connection onCreateOutgoingConnection( - PhoneAccountHandle phoneAccount, ConnectionRequest request) { - return null; - } - - @Override - public Connection onCreateIncomingConnection( - PhoneAccountHandle phoneAccount, ConnectionRequest request) { - LogUtil.i("DebugConnectionService.onCreateIncomingConnection", null); - DebugConnection connection = new DebugConnection(); - connection.setRinging(); - connection.setAddress(getPhoneNumber(request), TelecomManager.PRESENTATION_ALLOWED); - connection.setConnectionCapabilities( - Connection.CAPABILITY_MUTE | Connection.CAPABILITY_SUPPORT_HOLD); - return connection; - } -} -- cgit v1.2.3