release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240
Change-Id: I167ef142100ec324640ddc5c0590d6b9bbdf7541
diff --git a/src/com/android/providers/telephony/ProviderUtil.java b/src/com/android/providers/telephony/ProviderUtil.java
index 4234b06..cd0f351 100644
--- a/src/com/android/providers/telephony/ProviderUtil.java
+++ b/src/com/android/providers/telephony/ProviderUtil.java
@@ -109,6 +109,7 @@
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.d(TAG, "notifyIfNotDefaultSmsApp - called from " + callingPackage + ", notifying");
}
+ intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
context.sendBroadcast(intent);
}
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index a74ceb0..49c3d10 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -144,6 +144,7 @@
private static final String PREF_FILE_APN = "preferred-apn";
private static final String COLUMN_APN_ID = "apn_id";
+ private static final String EXPLICIT_SET_CALLED = "explicit_set_called";
private static final String PREF_FILE_FULL_APN = "preferred-full-apn";
private static final String DB_VERSION_KEY = "version";
@@ -1818,15 +1819,23 @@
return true;
}
- private void setPreferredApnId(Long id, int subId) {
+ private void setPreferredApnId(Long id, int subId, boolean saveApn) {
SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_APN,
Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit();
- editor.putLong(COLUMN_APN_ID + subId, id != null ? id.longValue() : INVALID_APN_ID);
+ editor.putLong(COLUMN_APN_ID + subId, id != null ? id : INVALID_APN_ID);
+ // This is for debug purposes. It indicates if this APN was set by DcTracker or user (true)
+ // or if this was restored from APN saved in PREF_FILE_FULL_APN (false).
+ editor.putBoolean(EXPLICIT_SET_CALLED + subId, saveApn);
editor.apply();
- // remove saved apn if apnId is invalid
if (id == null || id.longValue() == INVALID_APN_ID) {
deletePreferredApn(subId);
+ } else {
+ // If id is not invalid, and saveApn is true, save the actual APN in PREF_FILE_FULL_APN
+ // too.
+ if (saveApn) {
+ setPreferredApn(id, subId);
+ }
}
}
@@ -1837,8 +1846,7 @@
if (apnId == INVALID_APN_ID && checkApnSp) {
apnId = getPreferredApnIdFromApn(subId);
if (apnId != INVALID_APN_ID) {
- setPreferredApnId(apnId, subId);
- deletePreferredApn(subId);
+ setPreferredApnId(apnId, subId, false);
}
}
return apnId;
@@ -1847,7 +1855,12 @@
private void deletePreferredApnId() {
SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_APN,
Context.MODE_PRIVATE);
- // before deleting, save actual preferred apns (not the ids) in a separate SP
+
+ // Before deleting, save actual preferred apns (not the ids) in a separate SP.
+ // NOTE: This code to call setPreferredApn() can be removed since the function is now called
+ // from setPreferredApnId(). However older builds (pre oc-mr1) do not have that change, so
+ // when devices upgrade from those builds and this function is called, this code is needed
+ // otherwise the preferred APN will be lost.
Map<String, ?> allPrefApnId = sp.getAll();
for (String key : allPrefApnId.keySet()) {
// extract subId from key by removing COLUMN_APN_ID
@@ -1861,6 +1874,7 @@
loge("Skipping over key " + key + " due to exception " + e);
}
}
+
SharedPreferences.Editor editor = sp.edit();
editor.clear();
editor.apply();
@@ -1938,7 +1952,6 @@
for (String key : CARRIERS_UNIQUE_FIELDS) {
editor.remove(key + subId);
}
- editor.remove(DB_VERSION_KEY + subId);
editor.apply();
}
}
@@ -2257,7 +2270,7 @@
{
if (initialValues != null) {
if(initialValues.containsKey(COLUMN_APN_ID)) {
- setPreferredApnId(initialValues.getAsLong(COLUMN_APN_ID), subId);
+ setPreferredApnId(initialValues.getAsLong(COLUMN_APN_ID), subId, true);
}
}
break;
@@ -2296,6 +2309,8 @@
{
case URL_DELETE:
{
+ // Delete preferred APN for all subIds
+ deletePreferredApnId();
// Delete unedited entries
count = db.delete(CARRIERS_TABLE, "(" + where + unedited, whereArgs);
break;
@@ -2394,7 +2409,7 @@
case URL_PREFERAPN:
case URL_PREFERAPN_NO_UPDATE:
{
- setPreferredApnId((long)INVALID_APN_ID, subId);
+ setPreferredApnId((long)INVALID_APN_ID, subId, true);
if ((match == URL_PREFERAPN) || (match == URL_PREFERAPN_USING_SUBID)) count = 1;
break;
}
@@ -2527,7 +2542,7 @@
{
if (values != null) {
if (values.containsKey(COLUMN_APN_ID)) {
- setPreferredApnId(values.getAsLong(COLUMN_APN_ID), subId);
+ setPreferredApnId(values.getAsLong(COLUMN_APN_ID), subId, true);
if ((match == URL_PREFERAPN) ||
(match == URL_PREFERAPN_USING_SUBID)) {
count = 1;