diff options
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 6 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneConstantConversions.java | 91 |
2 files changed, 94 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index ea33906940a7..37d8592670ee 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -57,7 +57,7 @@ import com.android.internal.app.IBatteryStats; import com.android.internal.telephony.IOnSubscriptionsChangedListener; import com.android.internal.telephony.ITelephonyRegistry; import com.android.internal.telephony.IPhoneStateListener; -import com.android.internal.telephony.DefaultPhoneNotifier; +import com.android.internal.telephony.PhoneConstantConversions; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.ServiceStateTracker; import com.android.internal.telephony.TelephonyIntents; @@ -1497,7 +1497,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { Intent intent = new Intent(TelephonyManager.ACTION_PHONE_STATE_CHANGED); intent.putExtra(PhoneConstants.STATE_KEY, - DefaultPhoneNotifier.convertCallState(state).toString()); + PhoneConstantConversions.convertCallState(state).toString()); if (!TextUtils.isEmpty(incomingNumber)) { intent.putExtra(TelephonyManager.EXTRA_INCOMING_NUMBER, incomingNumber); } @@ -1531,7 +1531,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { // required info. Intent intent = new Intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED); intent.putExtra(PhoneConstants.STATE_KEY, - DefaultPhoneNotifier.convertDataState(state).toString()); + PhoneConstantConversions.convertDataState(state).toString()); if (!isDataConnectivityPossible) { intent.putExtra(PhoneConstants.NETWORK_UNAVAILABLE_KEY, true); } diff --git a/telephony/java/com/android/internal/telephony/PhoneConstantConversions.java b/telephony/java/com/android/internal/telephony/PhoneConstantConversions.java new file mode 100644 index 000000000000..f7f0f29fcb29 --- /dev/null +++ b/telephony/java/com/android/internal/telephony/PhoneConstantConversions.java @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2006 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.internal.telephony; + +import android.telephony.ServiceState; +import android.telephony.TelephonyManager; +import android.telephony.PreciseCallState; + +import com.android.internal.telephony.PhoneConstants; + +import java.util.List; + +public class PhoneConstantConversions { + /** + * Convert the {@link PhoneConstants.State} enum into the TelephonyManager.CALL_STATE_* + * constants for the public API. + */ + public static int convertCallState(PhoneConstants.State state) { + switch (state) { + case RINGING: + return TelephonyManager.CALL_STATE_RINGING; + case OFFHOOK: + return TelephonyManager.CALL_STATE_OFFHOOK; + default: + return TelephonyManager.CALL_STATE_IDLE; + } + } + + /** + * Convert the TelephonyManager.CALL_STATE_* constants into the + * {@link PhoneConstants.State} enum for the public API. + */ + public static PhoneConstants.State convertCallState(int state) { + switch (state) { + case TelephonyManager.CALL_STATE_RINGING: + return PhoneConstants.State.RINGING; + case TelephonyManager.CALL_STATE_OFFHOOK: + return PhoneConstants.State.OFFHOOK; + default: + return PhoneConstants.State.IDLE; + } + } + + /** + * Convert the {@link PhoneConstants.DataState} enum into the TelephonyManager.DATA_* constants + * for the public API. + */ + public static int convertDataState(PhoneConstants.DataState state) { + switch (state) { + case CONNECTING: + return TelephonyManager.DATA_CONNECTING; + case CONNECTED: + return TelephonyManager.DATA_CONNECTED; + case SUSPENDED: + return TelephonyManager.DATA_SUSPENDED; + default: + return TelephonyManager.DATA_DISCONNECTED; + } + } + + /** + * Convert the TelephonyManager.DATA_* constants into {@link PhoneConstants.DataState} enum + * for the public API. + */ + public static PhoneConstants.DataState convertDataState(int state) { + switch (state) { + case TelephonyManager.DATA_CONNECTING: + return PhoneConstants.DataState.CONNECTING; + case TelephonyManager.DATA_CONNECTED: + return PhoneConstants.DataState.CONNECTED; + case TelephonyManager.DATA_SUSPENDED: + return PhoneConstants.DataState.SUSPENDED; + default: + return PhoneConstants.DataState.DISCONNECTED; + } + } +} |