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

SetupWizard : Use MccTable for mcc -> locale lookup 

Some sims such as T-Mobile return incorrect languages for their
PL(Preferred languages). Lookup the locale via the MccTable instead,
and fallback to trusting the sim.

Change-Id: I612d4952355ce4a42b35579e1f9aa879417c4cd4
This commit is contained in:
Danesh M 2016-01-27 16:11:09 -08:00 committed by Gerrit Code Review
parent 06aa3eb165
commit 95246f2063
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -16,7 +16,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v13 \ android-support-v13 \
play \ play \
libphonenumber \ libphonenumber \
org.cyanogenmod.platform.sdk org.cyanogenmod.platform.sdk \
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

34
src/com/cyanogenmod/setupwizard/setup/WelcomePage.java
View File

@ -30,6 +30,8 @@ import android.content.res.Resources;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@ -37,6 +39,7 @@ import android.widget.ArrayAdapter;
import android.widget.NumberPicker; import android.widget.NumberPicker;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.telephony.MccTable;
import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.R;
import com.cyanogenmod.setupwizard.SetupWizardApp; import com.cyanogenmod.setupwizard.SetupWizardApp;
import com.cyanogenmod.setupwizard.cmstats.SetupStats; import com.cyanogenmod.setupwizard.cmstats.SetupStats;
@ -44,6 +47,7 @@ import com.cyanogenmod.setupwizard.ui.LocalePicker;
import com.cyanogenmod.setupwizard.ui.SetupPageFragment; import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
import com.cyanogenmod.setupwizard.util.SetupWizardUtils; import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
import java.util.List;
import java.util.Locale; import java.util.Locale;
public class WelcomePage extends SetupPage { public class WelcomePage extends SetupPage {
@ -285,16 +289,34 @@ public class WelcomePage extends SetupPage {
private class FetchUpdateSimLocaleTask extends AsyncTask<Void, Void, Locale> { private class FetchUpdateSimLocaleTask extends AsyncTask<Void, Void, Locale> {
@Override @Override
protected Locale doInBackground(Void... params) { protected Locale doInBackground(Void... params) {
Locale locale = null;
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
TelephonyManager telephonyManager = (TelephonyManager) activity. final SubscriptionManager subscriptionManager =
getSystemService(Context.TELEPHONY_SERVICE); SubscriptionManager.from(activity);
String locale = telephonyManager.getLocaleFromDefaultSim(); List<SubscriptionInfo> activeSubs =
if (locale != null) { subscriptionManager.getActiveSubscriptionInfoList();
return Locale.forLanguageTag(locale); if (activeSubs == null || activeSubs.isEmpty()) {
return null;
}
// Fetch locale for active sim's MCC
int mcc = activeSubs.get(0).getMcc();
locale = MccTable.getLocaleFromMcc(activity, mcc, null);
// If that fails, fall back to preferred languages reported
// by the sim
if (locale == null) {
TelephonyManager telephonyManager = (TelephonyManager) activity.
getSystemService(Context.TELEPHONY_SERVICE);
String localeString = telephonyManager.getLocaleFromDefaultSim();
if (localeString != null) {
locale = Locale.forLanguageTag(localeString);
}
} }
} }
return null; return locale;
} }
@Override @Override