ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

setupwizard: Adapt to MR1 multisim APIs

Browse Source 
Change-Id: Icb5bad076fe5a5e8a26befc5bedd04981c374117
This commit is contained in:
Steve Kondik 2015-03-22 17:18:31 -07:00
parent bfde63c27c
commit c225cd58f7
3 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -17,6 +17,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
play \ play \
libphonenumber libphonenumber
LOCAL_JAVA_LIBRARIES := \
telephony-common
# Include res dir from chips # Include res dir from chips
google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res
res_dir := $(google_play_dir) res res_dir := $(google_play_dir) res

57
src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
View File

@ -23,7 +23,7 @@ import android.os.Bundle;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.SubInfoRecord; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
@ -35,6 +35,8 @@ import android.widget.CheckBox;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.telephony.SubscriptionController;
import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.R;
import com.cyanogenmod.setupwizard.cmstats.SetupStats; import com.cyanogenmod.setupwizard.cmstats.SetupStats;
import com.cyanogenmod.setupwizard.ui.SetupPageFragment; import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
@ -45,8 +47,11 @@ public class ChooseDataSimPage extends SetupPage {
public static final String TAG = "ChooseDataSimPage"; public static final String TAG = "ChooseDataSimPage";
private SubscriptionManager mSubscriptionManager;
public ChooseDataSimPage(Context context, SetupDataCallbacks callbacks) { public ChooseDataSimPage(Context context, SetupDataCallbacks callbacks) {
super(context, callbacks); super(context, callbacks);
mSubscriptionManager = SubscriptionManager.from(context);
} }
@Override @Override
@ -73,7 +78,7 @@ public class ChooseDataSimPage extends SetupPage {
} }
public static class ChooseDataSimFragment extends SetupPageFragment { public class ChooseDataSimFragment extends SetupPageFragment {
private ViewGroup mPageView; private ViewGroup mPageView;
private SparseArray<TextView> mNameViews; private SparseArray<TextView> mNameViews;
@ -81,7 +86,7 @@ public class ChooseDataSimPage extends SetupPage {
private SparseArray<CheckBox> mCheckBoxes; private SparseArray<CheckBox> mCheckBoxes;
private TelephonyManager mPhone; private TelephonyManager mPhone;
private List<SubInfoRecord> mSubInfoRecords; private List<SubscriptionInfo> mSubInfoRecords;
private SparseArray<SignalStrength> mSignalStrengths; private SparseArray<SignalStrength> mSignalStrengths;
private SparseArray<ServiceState> mServiceStates; private SparseArray<ServiceState> mServiceStates;
private SparseArray<PhoneStateListener> mPhoneStateListeners; private SparseArray<PhoneStateListener> mPhoneStateListeners;
@ -91,9 +96,10 @@ public class ChooseDataSimPage extends SetupPage {
private View.OnClickListener mSetDataSimClickListener = new View.OnClickListener() { private View.OnClickListener mSetDataSimClickListener = new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
SubInfoRecord subInfoRecord = (SubInfoRecord)view.getTag(); SubscriptionInfo subInfoRecord = (SubscriptionInfo)view.getTag();
if (subInfoRecord != null) { if (subInfoRecord != null) {
SubscriptionManager.setDefaultDataSubId(subInfoRecord.subId); SubscriptionController.getInstance()
.setDefaultDataSubId(subInfoRecord.getSubscriptionId());
setDataSubChecked(subInfoRecord); setDataSubChecked(subInfoRecord);
} }
} }
@ -102,7 +108,7 @@ public class ChooseDataSimPage extends SetupPage {
@Override @Override
protected void initializePage() { protected void initializePage() {
mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view); mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view);
mSubInfoRecords = SubscriptionManager.getActiveSubInfoList(); mSubInfoRecords = mSubscriptionManager.getActiveSubscriptionInfoList();
int simCount = mSubInfoRecords.size(); int simCount = mSubInfoRecords.size();
mNameViews = new SparseArray<TextView>(simCount); mNameViews = new SparseArray<TextView>(simCount);
mSignalViews = new SparseArray<ImageView>(simCount); mSignalViews = new SparseArray<ImageView>(simCount);
@ -114,7 +120,7 @@ public class ChooseDataSimPage extends SetupPage {
for (int i = 0; i < simCount; i++) { for (int i = 0; i < simCount; i++) {
View simRow = inflater.inflate(R.layout.data_sim_row, null); View simRow = inflater.inflate(R.layout.data_sim_row, null);
mPageView.addView(simRow); mPageView.addView(simRow);
SubInfoRecord subInfoRecord = mSubInfoRecords.get(i); SubscriptionInfo subInfoRecord = mSubInfoRecords.get(i);
simRow.setTag(subInfoRecord); simRow.setTag(subInfoRecord);
simRow.setOnClickListener(mSetDataSimClickListener); simRow.setOnClickListener(mSetDataSimClickListener);
mNameViews.put(i, (TextView) simRow.findViewById(R.id.sim_title)); mNameViews.put(i, (TextView) simRow.findViewById(R.id.sim_title));
@ -155,13 +161,13 @@ public class ChooseDataSimPage extends SetupPage {
} }
} }
private PhoneStateListener createPhoneStateListener(final SubInfoRecord subInfoRecord) { private PhoneStateListener createPhoneStateListener(final SubscriptionInfo subInfoRecord) {
return new PhoneStateListener(subInfoRecord.subId) { return new PhoneStateListener(subInfoRecord.getSubscriptionId()) {
@Override @Override
public void onSignalStrengthsChanged(SignalStrength signalStrength) { public void onSignalStrengthsChanged(SignalStrength signalStrength) {
if (mIsAttached) { if (mIsAttached) {
mSignalStrengths.put(subInfoRecord.slotId, signalStrength); mSignalStrengths.put(subInfoRecord.getSimSlotIndex(), signalStrength);
updateSignalStrength(subInfoRecord); updateSignalStrength(subInfoRecord);
} }
} }
@ -169,7 +175,7 @@ public class ChooseDataSimPage extends SetupPage {
@Override @Override
public void onServiceStateChanged(ServiceState state) { public void onServiceStateChanged(ServiceState state) {
if (mIsAttached) { if (mIsAttached) {
mServiceStates.put(subInfoRecord.slotId, state); mServiceStates.put(subInfoRecord.getSimSlotIndex(), state);
updateSignalStrength(subInfoRecord); updateSignalStrength(subInfoRecord);
} }
} }
@ -184,10 +190,10 @@ public class ChooseDataSimPage extends SetupPage {
} }
} }
private void setDataSubChecked(SubInfoRecord subInfoRecord) { private void setDataSubChecked(SubscriptionInfo subInfoRecord) {
if (mIsAttached) { if (mIsAttached) {
for (int i = 0; i < mCheckBoxes.size(); i++) { for (int i = 0; i < mCheckBoxes.size(); i++) {
if (subInfoRecord.slotId == i) { if (subInfoRecord.getSimSlotIndex() == i) {
mCheckBoxes.get(i).setChecked(true); mCheckBoxes.get(i).setChecked(true);
SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED, SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED,
SetupStats.Action.PREFERRED_DATA_SIM, SetupStats.Action.PREFERRED_DATA_SIM,
@ -203,18 +209,18 @@ public class ChooseDataSimPage extends SetupPage {
private void updateCurrentDataSub() { private void updateCurrentDataSub() {
if (mIsAttached) { if (mIsAttached) {
for (int i = 0; i < mSubInfoRecords.size(); i++) { for (int i = 0; i < mSubInfoRecords.size(); i++) {
SubInfoRecord subInfoRecord = mSubInfoRecords.get(i); SubscriptionInfo subInfoRecord = mSubInfoRecords.get(i);
mCheckBoxes.get(i).setChecked(SubscriptionManager.getDefaultDataSubId() mCheckBoxes.get(i).setChecked(SubscriptionManager.getDefaultDataSubId()
== subInfoRecord.subId); == subInfoRecord.getSimSlotIndex());
} }
} }
} }
private void updateCarrierText(SubInfoRecord subInfoRecord) { private void updateCarrierText(SubscriptionInfo subInfoRecord) {
if (mIsAttached) { if (mIsAttached) {
String name = mPhone.getNetworkOperatorName(subInfoRecord.subId); String name = mPhone.getNetworkOperatorName(subInfoRecord.getSimSlotIndex());
ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId); ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
if (serviceState != null && serviceState.isEmergencyOnly()) { if (serviceState != null && serviceState.isEmergencyOnly()) {
name = getString(R.string.setup_mobile_data_emergency_only); name = getString(R.string.setup_mobile_data_emergency_only);
@ -223,15 +229,16 @@ public class ChooseDataSimPage extends SetupPage {
} }
} }
String formattedName = String formattedName =
getString(R.string.data_sim_name, subInfoRecord.slotId + 1, name); getString(R.string.data_sim_name,
mNameViews.get(subInfoRecord.slotId).setText(formattedName); subInfoRecord.getSimSlotIndex() + 1, name);
mNameViews.get(subInfoRecord.getSimSlotIndex()).setText(formattedName);
} }
} }
private void updateSignalStrength(SubInfoRecord subInfoRecord) { private void updateSignalStrength(SubscriptionInfo subInfoRecord) {
if (mIsAttached) { if (mIsAttached) {
ImageView signalView = mSignalViews.get(subInfoRecord.slotId); ImageView signalView = mSignalViews.get(subInfoRecord.getSimSlotIndex());
SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.slotId); SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.getSimSlotIndex());
if (!hasService(subInfoRecord)) { if (!hasService(subInfoRecord)) {
signalView.setImageResource(R.drawable.ic_signal_no_signal); signalView.setImageResource(R.drawable.ic_signal_no_signal);
} else { } else {
@ -261,9 +268,9 @@ public class ChooseDataSimPage extends SetupPage {
} }
} }
private boolean hasService(SubInfoRecord subInfoRecord) { private boolean hasService(SubscriptionInfo subInfoRecord) {
boolean retVal; boolean retVal;
ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId); ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
if (serviceState != null) { if (serviceState != null) {
// Consider the device to be in service if either voice or data service is available. // Consider the device to be in service if either voice or data service is available.
// Some SIM cards are marketed as data-only and do not support voice service, and on // Some SIM cards are marketed as data-only and do not support voice service, and on

8
src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
View File

@ -32,6 +32,8 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.SubscriptionController;
import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.GooglePlayServicesUtil;
@ -78,10 +80,10 @@ public class SetupWizardUtils {
TelephonyManager tm = TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (tm.isMultiSimEnabled()) { if (tm.isMultiSimEnabled()) {
int phoneId = SubscriptionManager.getDefaultDataPhoneId(); int phoneId = SubscriptionManager.from(context).getDefaultDataPhoneId();
android.provider.Settings.Global.putInt(context.getContentResolver(), android.provider.Settings.Global.putInt(context.getContentResolver(),
android.provider.Settings.Global.MOBILE_DATA + phoneId, enabled ? 1 : 0); android.provider.Settings.Global.MOBILE_DATA + phoneId, enabled ? 1 : 0);
long subId = SubscriptionManager.getDefaultDataSubId(); int subId = SubscriptionManager.getDefaultDataSubId();
tm.setDataEnabledUsingSubId(subId, enabled); tm.setDataEnabledUsingSubId(subId, enabled);
} else { } else {
android.provider.Settings.Global.putInt(context.getContentResolver(), android.provider.Settings.Global.putInt(context.getContentResolver(),
@ -111,7 +113,7 @@ public class SetupWizardUtils {
public static boolean isSimMissing(Context context) { public static boolean isSimMissing(Context context) {
TelephonyManager tm = TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
int simCount = SubscriptionManager.getActiveSubInfoCount(); int simCount = SubscriptionController.getInstance().getActiveSubInfoCount();
for (int i = 0; i < simCount; i++) { for (int i = 0; i < simCount; i++) {
int simState = tm.getSimState(i); int simState = tm.getSimState(i);
if (simState != TelephonyManager.SIM_STATE_ABSENT && if (simState != TelephonyManager.SIM_STATE_ABSENT &&