PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ApnEditor changes to support bearer as a bitmask.

Browse Source 
Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
This commit is contained in:
Amit Mahajan
2015-04-16 10:01:25 -07:00
parent e8d8af2b46
commit 7e28221640
3 changed files with 143 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
res/values/arrays.xml
View File

@@ -526,18 +526,57 @@
<!-- Bearer Info used in APN editor --> <!-- Bearer Info used in APN editor -->
<string-array name="bearer_entries"> <string-array name="bearer_entries">
<item>LTE</item>
<item>eHRPD</item>
<item>Unspecified</item> <item>Unspecified</item>
<item>LTE</item>
<item>HSPAP</item>
<item>HSPA</item>
<item>HSUPA</item>
<item>HSDPA</item>
<item>UMTS</item>
<item>EDGE</item>
<item>GPRS</item>
<item>eHRPD</item>
<item>EVDO_B</item>
<item>EVDO_A</item>
<item>EVDO_0</item>
<item>1xRTT</item>
<item>IS95B</item>
<item>IS95A</item>
</string-array> </string-array>
<string-array translatable="false" name="bearer_values"> <string-array translatable="false" name="bearer_values">
<!-- Do not translate. -->
<item>0</item>
<!-- Do not translate. --> <!-- Do not translate. -->
<item>14</item> <item>14</item>
<!-- Do not translate. --> <!-- Do not translate. -->
<item>15</item>
<!-- Do not translate. -->
<item>11</item>
<!-- Do not translate. -->
<item>10</item>
<!-- Do not translate. -->
<item>9</item>
<!-- Do not translate. -->
<item>3</item>
<!-- Do not translate. -->
<item>2</item>
<!-- Do not translate. -->
<item>1</item>
<!-- Do not translate. -->
<item>13</item> <item>13</item>
<!-- Do not translate. --> <!-- Do not translate. -->
<item>0</item> <item>12</item>
<!-- Do not translate. -->
<item>8</item>
<!-- Do not translate. -->
<item>7</item>
<!-- Do not translate. -->
<item>6</item>
<!-- Do not translate. -->
<item>5</item>
<!-- Do not translate. -->
<item>4</item>
</string-array> </string-array>
<!-- MVNO Info used in APN editor --> <!-- MVNO Info used in APN editor -->

4
res/xml/apn_editor.xml
View File

@@ -135,9 +135,9 @@
android:summaryOn="@string/carrier_enabled_summaryOn" android:summaryOn="@string/carrier_enabled_summaryOn"
android:summaryOff="@@string/carrier_enabled_summaryOff" android:summaryOff="@@string/carrier_enabled_summaryOff"
/> />
<ListPreference <MultiSelectListPreference
android:title="@string/bearer" android:title="@string/bearer"
android:key="bearer" android:key="bearer_multi"
android:entries="@array/bearer_entries" android:entries="@array/bearer_entries"
android:entryValues="@array/bearer_values" android:entryValues="@array/bearer_values"
/> />

118
src/com/android/settings/ApnEditor.java
View File

@@ -28,18 +28,23 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.MultiSelectListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.SwitchPreference; import android.preference.SwitchPreference;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import java.util.HashSet;
import java.util.Set;
public class ApnEditor extends InstrumentedPreferenceActivity public class ApnEditor extends InstrumentedPreferenceActivity
implements SharedPreferences.OnSharedPreferenceChangeListener, implements SharedPreferences.OnSharedPreferenceChangeListener,
@@ -52,7 +57,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
private final static String KEY_PROTOCOL = "apn_protocol"; private final static String KEY_PROTOCOL = "apn_protocol";
private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol"; private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
private final static String KEY_CARRIER_ENABLED = "carrier_enabled"; private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
private final static String KEY_BEARER = "bearer"; private final static String KEY_BEARER_MULTI = "bearer_multi";
private final static String KEY_MVNO_TYPE = "mvno_type"; private final static String KEY_MVNO_TYPE = "mvno_type";
private static final int MENU_DELETE = Menu.FIRST; private static final int MENU_DELETE = Menu.FIRST;
@@ -78,7 +83,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
private ListPreference mProtocol; private ListPreference mProtocol;
private ListPreference mRoamingProtocol; private ListPreference mRoamingProtocol;
private SwitchPreference mCarrierEnabled; private SwitchPreference mCarrierEnabled;
private ListPreference mBearer; private MultiSelectListPreference mBearerMulti;
private ListPreference mMvnoType; private ListPreference mMvnoType;
private EditTextPreference mMvnoMatchData; private EditTextPreference mMvnoMatchData;
@@ -92,6 +97,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
private int mSubId; private int mSubId;
private Resources mRes; private Resources mRes;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private int mBearerInitialVal = 0;
/** /**
* Standard projection for the interesting columns of a normal note. * Standard projection for the interesting columns of a normal note.
@@ -116,9 +122,10 @@ public class ApnEditor extends InstrumentedPreferenceActivity
Telephony.Carriers.PROTOCOL, // 16 Telephony.Carriers.PROTOCOL, // 16
Telephony.Carriers.CARRIER_ENABLED, // 17 Telephony.Carriers.CARRIER_ENABLED, // 17
Telephony.Carriers.BEARER, // 18 Telephony.Carriers.BEARER, // 18
Telephony.Carriers.ROAMING_PROTOCOL, // 19 Telephony.Carriers.BEARER_BITMASK, // 19
Telephony.Carriers.MVNO_TYPE, // 20 Telephony.Carriers.ROAMING_PROTOCOL, // 20
Telephony.Carriers.MVNO_MATCH_DATA // 21 Telephony.Carriers.MVNO_TYPE, // 21
Telephony.Carriers.MVNO_MATCH_DATA // 22
}; };
private static final int ID_INDEX = 0; private static final int ID_INDEX = 0;
@@ -139,9 +146,10 @@ public class ApnEditor extends InstrumentedPreferenceActivity
private static final int PROTOCOL_INDEX = 16; private static final int PROTOCOL_INDEX = 16;
private static final int CARRIER_ENABLED_INDEX = 17; private static final int CARRIER_ENABLED_INDEX = 17;
private static final int BEARER_INDEX = 18; private static final int BEARER_INDEX = 18;
private static final int ROAMING_PROTOCOL_INDEX = 19; private static final int BEARER_BITMASK_INDEX = 19;
private static final int MVNO_TYPE_INDEX = 20; private static final int ROAMING_PROTOCOL_INDEX = 20;
private static final int MVNO_MATCH_DATA_INDEX = 21; private static final int MVNO_TYPE_INDEX = 21;
private static final int MVNO_MATCH_DATA_INDEX = 22;
@Override @Override
@@ -176,8 +184,8 @@ public class ApnEditor extends InstrumentedPreferenceActivity
mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED); mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED);
mBearer = (ListPreference) findPreference(KEY_BEARER); mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
mBearer.setOnPreferenceChangeListener(this); mBearerMulti.setOnPreferenceChangeListener(this);
mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE); mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
mMvnoType.setOnPreferenceChangeListener(this); mMvnoType.setOnPreferenceChangeListener(this);
@@ -289,7 +297,31 @@ public class ApnEditor extends InstrumentedPreferenceActivity
mProtocol.setValue(mCursor.getString(PROTOCOL_INDEX)); mProtocol.setValue(mCursor.getString(PROTOCOL_INDEX));
mRoamingProtocol.setValue(mCursor.getString(ROAMING_PROTOCOL_INDEX)); mRoamingProtocol.setValue(mCursor.getString(ROAMING_PROTOCOL_INDEX));
mCarrierEnabled.setChecked(mCursor.getInt(CARRIER_ENABLED_INDEX)==1); mCarrierEnabled.setChecked(mCursor.getInt(CARRIER_ENABLED_INDEX)==1);
mBearer.setValue(mCursor.getString(BEARER_INDEX)); mBearerInitialVal = mCursor.getInt(BEARER_INDEX);
HashSet<String> bearers = new HashSet<String>();
int bearerBitmask = mCursor.getInt(BEARER_BITMASK_INDEX);
if (bearerBitmask == 0) {
if (mBearerInitialVal == 0) {
bearers.add("" + 0);
}
} else {
int i = 1;
while (bearerBitmask != 0) {
if ((bearerBitmask & 1) == 1) {
bearers.add("" + i);
}
bearerBitmask >>= 1;
i++;
}
}
if (mBearerInitialVal != 0 && bearers.contains("" + mBearerInitialVal) == false) {
// add mBearerInitialVal to bearers
bearers.add("" + mBearerInitialVal);
}
mBearerMulti.setValues(bearers);
mMvnoType.setValue(mCursor.getString(MVNO_TYPE_INDEX)); mMvnoType.setValue(mCursor.getString(MVNO_TYPE_INDEX));
mMvnoMatchData.setEnabled(false); mMvnoMatchData.setEnabled(false);
mMvnoMatchData.setText(mCursor.getString(MVNO_MATCH_DATA_INDEX)); mMvnoMatchData.setText(mCursor.getString(MVNO_MATCH_DATA_INDEX));
@@ -324,8 +356,8 @@ public class ApnEditor extends InstrumentedPreferenceActivity
checkNull(protocolDescription(mProtocol.getValue(), mProtocol))); checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
mRoamingProtocol.setSummary( mRoamingProtocol.setSummary(
checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol))); checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
mBearer.setSummary( mBearerMulti.setSummary(
checkNull(bearerDescription(mBearer.getValue()))); checkNull(bearerMultiDescription(mBearerMulti.getValues())));
mMvnoType.setSummary( mMvnoType.setSummary(
checkNull(mvnoDescription(mMvnoType.getValue()))); checkNull(mvnoDescription(mMvnoType.getValue())));
mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText())); mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
@@ -358,7 +390,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
} }
private String bearerDescription(String raw) { private String bearerDescription(String raw) {
int mBearerIndex = mBearer.findIndexOfValue(raw); int mBearerIndex = mBearerMulti.findIndexOfValue(raw);
if (mBearerIndex == -1) { if (mBearerIndex == -1) {
return null; return null;
} else { } else {
@@ -371,6 +403,30 @@ public class ApnEditor extends InstrumentedPreferenceActivity
} }
} }
private String bearerMultiDescription(Set<String> raw) {
String[] values = mRes.getStringArray(R.array.bearer_entries);
StringBuilder retVal = new StringBuilder();
boolean first = true;
for (String bearer : raw) {
int bearerIndex = mBearerMulti.findIndexOfValue(bearer);
try {
if (first) {
retVal.append(values[bearerIndex]);
first = false;
} else {
retVal.append(", " + values[bearerIndex]);
}
} catch (ArrayIndexOutOfBoundsException e) {
// ignore
}
}
String val = retVal.toString();
if (!TextUtils.isEmpty(val)) {
return val;
}
return null;
}
private String mvnoDescription(String newValue) { private String mvnoDescription(String newValue) {
int mvnoIndex = mMvnoType.findIndexOfValue(newValue); int mvnoIndex = mMvnoType.findIndexOfValue(newValue);
String oldValue = mMvnoType.getValue(); String oldValue = mMvnoType.getValue();
@@ -429,13 +485,13 @@ public class ApnEditor extends InstrumentedPreferenceActivity
} }
mRoamingProtocol.setSummary(protocol); mRoamingProtocol.setSummary(protocol);
mRoamingProtocol.setValue((String) newValue); mRoamingProtocol.setValue((String) newValue);
} else if (KEY_BEARER.equals(key)) { } else if (KEY_BEARER_MULTI.equals(key)) {
String bearer = bearerDescription((String) newValue); String bearer = bearerMultiDescription((Set<String>) newValue);
if (bearer == null) { if (bearer == null) {
return false; return false;
} }
mBearer.setValue((String) newValue); mBearerMulti.setValues((Set<String>) newValue);
mBearer.setSummary(bearer); mBearerMulti.setSummary(bearer);
} else if (KEY_MVNO_TYPE.equals(key)) { } else if (KEY_MVNO_TYPE.equals(key)) {
String mvno = mvnoDescription((String) newValue); String mvno = mvnoDescription((String) newValue);
if (mvno == null) { if (mvno == null) {
@@ -571,10 +627,30 @@ public class ApnEditor extends InstrumentedPreferenceActivity
} }
} }
String bearerVal = mBearer.getValue(); Set<String> bearerSet = mBearerMulti.getValues();
if (bearerVal != null) { int bearerBitmask = 0;
values.put(Telephony.Carriers.BEARER, Integer.parseInt(bearerVal)); for (String bearer : bearerSet) {
if (Integer.parseInt(bearer) == 0) {
bearerBitmask = 0;
break;
} else {
bearerBitmask |= ServiceState.getBitmaskForTech(Integer.parseInt(bearer));
} }
}
values.put(Telephony.Carriers.BEARER_BITMASK, bearerBitmask);
int bearerVal;
if (bearerBitmask == 0 || mBearerInitialVal == 0) {
bearerVal = 0;
} else if (ServiceState.bitmaskHasTech(bearerBitmask, mBearerInitialVal)) {
bearerVal = mBearerInitialVal;
} else {
// bearer field was being used but bitmask has changed now and does not include the
// initial bearer value -- setting bearer to 0 but maybe better behavior is to choose a
// random tech from the new bitmask??
bearerVal = 0;
}
values.put(Telephony.Carriers.BEARER, bearerVal);
values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue())); values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText())); values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));