diff options
Diffstat (limited to 'telephony/java')
5 files changed, 61 insertions, 18 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 299c7c4..b3beaf9 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -18,9 +18,11 @@ package android.telephony; import com.android.internal.telephony.ICarrierConfigLoader; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.content.Context; -import android.os.Bundle; +import android.os.PersistableBundle; import android.os.RemoteException; import android.os.ServiceManager; @@ -131,8 +133,8 @@ public class CarrierConfigManager { /** Used in Cellular Network Settings for preferred network type. */ public static final String BOOL_PREFER_2G = "bool_prefer_2g"; - /** Show cdma auto network mode in (glabal) roaming */ - public static final String BOOL_SHOW_CDMA = "bool_show_cdma"; + /** Show cdma network mode choices 1x, 3G, global etc. */ + public static final String BOOL_SHOW_CDMA_CHOICES = "bool_show_cdma_choices"; /** CDMA activation goes through HFA */ public static final String BOOL_USE_HFA_FOR_PROVISIONING = "bool_use_hfa_for_provisioning"; @@ -232,10 +234,10 @@ public class CarrierConfigManager { private final static String TAG = "CarrierConfigManager"; /** The default value for every variable. */ - private final static Bundle sDefaults; + private final static PersistableBundle sDefaults; static { - sDefaults = new Bundle(); + sDefaults = new PersistableBundle(); sDefaults.putBoolean(BOOL_ADDITIONAL_CALL_SETTING, true); sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG, false); sDefaults.putBoolean(BOOL_ALLOW_LOCAL_DTMF_TONES, true); @@ -254,7 +256,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(BOOL_OPERATOR_SELECTION_EXPAND, true); sDefaults.putBoolean(BOOL_PREFER_2G, true); sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false); - sDefaults.putBoolean(BOOL_SHOW_CDMA, false); + sDefaults.putBoolean(BOOL_SHOW_CDMA_CHOICES, false); sDefaults.putBoolean(BOOL_SHOW_ONSCREEN_DIAL_BUTTON, true); sDefaults.putBoolean(BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS, true); sDefaults.putBoolean(BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, true); @@ -276,10 +278,11 @@ public class CarrierConfigManager { * values. * * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}. - * @return A {@link Bundle} containing the config for the given subId, or default values for an - * invalid subId. + * @return A {@link PersistableBundle} containing the config for the given subId, or default + * values for an invalid subId. */ - public Bundle getConfigForSubId(int subId) { + @Nullable + public PersistableBundle getConfigForSubId(int subId) { try { return getICarrierConfigLoader().getConfigForSubId(subId); } catch (RemoteException ex) { @@ -297,7 +300,8 @@ public class CarrierConfigManager { * * @see #getConfigForSubId */ - public Bundle getConfig() { + @Nullable + public PersistableBundle getConfig() { return getConfigForSubId(SubscriptionManager.getDefaultSubId()); } @@ -348,9 +352,10 @@ public class CarrierConfigManager { * * @hide */ + @NonNull @SystemApi - public static Bundle getDefaultConfig() { - return new Bundle(sDefaults); + public static PersistableBundle getDefaultConfig() { + return new PersistableBundle(sDefaults); } /** @hide */ diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 9fea418..0c5c557 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -255,5 +255,43 @@ public class RadioAccessFamily implements Parcelable { return type; } -} + public static int singleRafTypeFromString(String rafString) { + switch (rafString) { + case "GPRS": return RAF_GPRS; + case "EDGE": return RAF_EDGE; + case "UMTS": return RAF_UMTS; + case "IS95A": return RAF_IS95A; + case "IS95B": return RAF_IS95B; + case "1XRTT": return RAF_1xRTT; + case "EVDO_0": return RAF_EVDO_0; + case "EVDO_A": return RAF_EVDO_A; + case "HSDPA": return RAF_HSDPA; + case "HSUPA": return RAF_HSUPA; + case "HSPA": return RAF_HSPA; + case "EVDO_B": return RAF_EVDO_B; + case "EHRPD": return RAF_EHRPD; + case "LTE": return RAF_LTE; + case "HSPAP": return RAF_HSPAP; + case "GSM": return RAF_GSM; + case "TD_SCDMA":return RAF_TD_SCDMA; + case "HS": return HS; + case "CDMA": return CDMA; + case "EVDO": return EVDO; + case "WCDMA": return WCDMA; + default: return RAF_UNKNOWN; + } + } + + public static int rafTypeFromString(String rafList) { + rafList = rafList.toUpperCase(); + String[] rafs = rafList.split("\\|"); + int result = 0; + for(String raf : rafs) { + int rafType = singleRafTypeFromString(raf.trim()); + if (rafType == RAF_UNKNOWN) return rafType; + result |= rafType; + } + return result; + } +} diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl index be8751b..9499c9f 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl @@ -16,7 +16,6 @@ package com.android.ims.internal; -import android.telecom.CameraCapabilities; import android.telecom.VideoProfile; /** @@ -43,7 +42,7 @@ oneway interface IImsVideoCallCallback { void changeCallDataUsage(long dataUsage); - void changeCameraCapabilities(in CameraCapabilities cameraCapabilities); + void changeCameraCapabilities(in VideoProfile.CameraCapabilities cameraCapabilities); void changeVideoQuality(int videoQuality); } diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl index 4ff0b43..39e83c6 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl @@ -16,6 +16,7 @@ package com.android.ims.internal; +import android.net.Uri; import android.view.Surface; import android.telecom.VideoProfile; @@ -60,5 +61,5 @@ oneway interface IImsVideoCallProvider { void requestCallDataUsage(); - void setPauseImage(String uri); + void setPauseImage(in Uri uri); } diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl index b5cdd9a..cb53f51 100644 --- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl @@ -16,14 +16,14 @@ package com.android.internal.telephony; -import android.os.Bundle; +import android.os.PersistableBundle; /** * Interface used to interact with the CarrierConfigLoader */ interface ICarrierConfigLoader { - Bundle getConfigForSubId(int subId); + PersistableBundle getConfigForSubId(int subId); void reloadCarrierConfigForSubId(int subId); |