From 71cf9d1d12b6f8a14a32c43e997d4649e8f783f1 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Thu, 12 Nov 2015 15:59:54 -0800 Subject: [PATCH 1/5] Make phone number in Sim Settings read properly in Talk back mode. Bug: 24308980 Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e --- src/com/android/settings/sim/SimSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 23e62756771..320a45f6968 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceScreen; import android.provider.SearchIndexableResource; +import android.telephony.PhoneNumberUtils; import android.telephony.PhoneStateListener; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -278,7 +279,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable setSummary(mSubInfoRecord.getDisplayName()); } else { setSummary(mSubInfoRecord.getDisplayName() + " - " + - getPhoneNumber(mSubInfoRecord)); + PhoneNumberUtils.createTtsSpannable(getPhoneNumber(mSubInfoRecord))); setEnabled(true); } setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext)))); From 24233d439e8efba5c9424ffc118781fbfb154db3 Mon Sep 17 00:00:00 2001 From: Hyejin Kim Date: Thu, 5 Nov 2015 12:35:39 +0900 Subject: [PATCH 2/5] Add IMS settings to Network setting reset Add the factory reset function to be used to reset IMS settings BUG=25300757 Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77 --- src/com/android/settings/ResetNetworkConfirm.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index db4b9a5ff4e..df708b91679 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -34,6 +34,7 @@ import android.widget.Button; import android.widget.Spinner; import android.widget.Toast; +import com.android.ims.ImsManager; import com.android.internal.logging.MetricsLogger; import com.android.internal.telephony.PhoneConstants; @@ -100,6 +101,8 @@ public class ResetNetworkConfirm extends InstrumentedFragment { btManager.getAdapter().factoryReset(); } + ImsManager.factoryReset(context); + Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT) .show(); } From 8bf272b44d91be76f227fb4d051e92ad89467901 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Wed, 28 Oct 2015 13:43:01 -0700 Subject: [PATCH 3/5] Validate the uri received in ApnEditor. Uri should only refer to telephony carriers and no other provider. Bug: 11184401 Change-Id: I38c25a37a48883f971c4f405a98db5066a707909 --- src/com/android/settings/ApnEditor.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 8299c670b2f..1a14ffe8355 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -203,10 +203,22 @@ public class ApnEditor extends InstrumentedPreferenceActivity mFirstTime = icicle == null; if (action.equals(Intent.ACTION_EDIT)) { - mUri = intent.getData(); + Uri uri = intent.getData(); + if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) { + Log.e(TAG, "Edit request not for carrier table. Uri: " + uri); + finish(); + return; + } + mUri = uri; } else if (action.equals(Intent.ACTION_INSERT)) { if (mFirstTime || icicle.getInt(SAVED_POS) == 0) { - mUri = getContentResolver().insert(intent.getData(), new ContentValues()); + Uri uri = intent.getData(); + if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) { + Log.e(TAG, "Insert request not for carrier table. Uri: " + uri); + finish(); + return; + } + mUri = getContentResolver().insert(uri, new ContentValues()); } else { mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, icicle.getInt(SAVED_POS)); From cd74ebb53dc61bf9d3bf6bc895d2def0f129f8d5 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Mon, 14 Dec 2015 13:23:29 -0800 Subject: [PATCH 4/5] Code cleanup including removing direct references to IMS classes. Bug: 25793157 Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0 --- src/com/android/settings/WifiCallingSettings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index 787ccb43487..f1764fad9c3 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -35,7 +35,7 @@ import android.widget.TextView; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.MetricsLogger; -import com.android.internal.telephony.imsphone.ImsPhone; +import com.android.internal.telephony.Phone; import com.android.settings.widget.SwitchBar; /** @@ -110,8 +110,8 @@ public class WifiCallingSettings extends SettingsPreferenceFragment private void showAlert(Intent intent) { Context context = getActivity(); - CharSequence title = intent.getCharSequenceExtra(ImsPhone.EXTRA_KEY_ALERT_TITLE); - CharSequence message = intent.getCharSequenceExtra(ImsPhone.EXTRA_KEY_ALERT_MESSAGE); + CharSequence title = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_TITLE); + CharSequence message = intent.getCharSequenceExtra(Phone.EXTRA_KEY_ALERT_MESSAGE); AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setMessage(message) @@ -189,7 +189,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment context.registerReceiver(mIntentReceiver, mIntentFilter); Intent intent = getActivity().getIntent(); - if (intent.getBooleanExtra(ImsPhone.EXTRA_KEY_ALERT_SHOW, false)) { + if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) { showAlert(intent); } } From e6479d578511e8055a34c2c460d92c28238abb50 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 3 Dec 2015 11:53:26 -0800 Subject: [PATCH 5/5] DO NOT MERGE - Added a new broadcast receiver to handle Brzail channel 50 area info Moved the area info handler from CellBroadcastReceiver to CellBroadcastAreaInfoReceiver. bug: 25628456 Change-Id: I2c7c6bb83245fcb6d9cc7b5dce7496e906160bab --- src/com/android/settings/deviceinfo/SimStatus.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index 83043c7a4d7..62ed9f17963 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -120,9 +120,7 @@ public class SimStatus extends InstrumentedPreferenceActivity { return; } CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message"); - if (cbMessage != null - && cbMessage.getServiceCategory() == 50 - && mSir.getSubscriptionId() == cbMessage.getSubId()) { + if (cbMessage != null && cbMessage.getServiceCategory() == 50) { String latestAreaInfo = cbMessage.getMessageBody(); updateAreaInfo(latestAreaInfo); }