[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d78ef43a1d -s ours am: 86c1af9d9f -s ours am: efdf336986 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1699297
Change-Id: Ib7060fcc1364faf606a5a467e0bd9d2538a1270a
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 309a57b..9bcbd19 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" product="tablet" msgid="9194799012395299737">"تهيئة شبكة الجوال"</string>
+ <string name="app_label" product="tablet" msgid="9194799012395299737">"إعداد شبكة الجوال"</string>
<string name="app_label" product="default" msgid="8338087656149558019">"مساحة تخزين للهاتف والرسائل"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 1c1c927..dc13503 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" product="tablet" msgid="9194799012395299737">"Мобайль Сүлжээний Тохируулга"</string>
- <string name="app_label" product="default" msgid="8338087656149558019">"Гар утас болон Зурвасын Санах ой"</string>
+ <string name="app_label" product="default" msgid="8338087656149558019">"Гар утас болон Мессежийн Санах ой"</string>
</resources>
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 068f209..a9494fb 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -526,6 +526,15 @@
@Override
public void onCreate(SQLiteDatabase db) {
localLog("onCreate: Creating all SMS-MMS tables.");
+
+ createMmsTables(db);
+ createSmsTables(db);
+ createCommonTables(db);
+ createCommonTriggers(db);
+ createMmsTriggers(db);
+ createWordsTables(db);
+ createIndices(db);
+
// if FBE is not supported, or if this onCreate is for CE partition database
if (!StorageManager.isFileEncryptedNativeOrEmulated()
|| (mContext != null && mContext.isCredentialProtectedStorage())) {
@@ -546,13 +555,6 @@
mContext.sendBroadcast(intent);
}
- createMmsTables(db);
- createSmsTables(db);
- createCommonTables(db);
- createCommonTriggers(db);
- createMmsTriggers(db);
- createWordsTables(db);
- createIndices(db);
}
private static void localLog(String logMsg) {
diff --git a/src/com/android/providers/telephony/TelephonyBackupAgent.java b/src/com/android/providers/telephony/TelephonyBackupAgent.java
index 6ce5da1..6032f5c 100644
--- a/src/com/android/providers/telephony/TelephonyBackupAgent.java
+++ b/src/com/android/providers/telephony/TelephonyBackupAgent.java
@@ -639,7 +639,7 @@
if (msgCount % bulkInsertSize == 0) {
mContentResolver.bulkInsert(Telephony.Sms.CONTENT_URI, values);
}
- } catch (Exception e) {
+ } catch (RuntimeException e) {
Log.e(TAG, "putSmsMessagesToProvider", e);
}
}
@@ -706,9 +706,17 @@
}
};
+ /**
+ * Sets a temporary {@code SmsProviderQuery} for testing; note that this method
+ * is not thread safe.
+ *
+ * @return the previous {@code SmsProviderQuery}
+ */
@VisibleForTesting
- public void setSmsProviderQuery(SmsProviderQuery smsProviderQuery) {
+ public SmsProviderQuery getAndSetSmsProviderQuery(SmsProviderQuery smsProviderQuery) {
+ SmsProviderQuery result = mSmsProviderQuery;
mSmsProviderQuery = smsProviderQuery;
+ return result;
}
private boolean doesMmsExist(Mms mms) {
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 1d72a28..84536ba 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -69,21 +69,17 @@
import static android.provider.Telephony.Carriers.USER_VISIBLE;
import static android.provider.Telephony.Carriers.WAIT_TIME_RETRY;
import static android.provider.Telephony.Carriers._ID;
-import static java.nio.charset.StandardCharsets.UTF_8;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.RequiresPermission;
import android.app.compat.CompatChanges;
import android.content.ComponentName;
import android.content.ContentProvider;
-import android.content.ContentProviderOperation;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
-import android.content.OperationApplicationException;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.UriMatcher;
@@ -129,7 +125,6 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -139,11 +134,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.Integer;
-import java.lang.NoSuchFieldException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -534,8 +527,8 @@
+ Telephony.SimInfo.COLUMN_CROSS_SIM_CALLING_ENABLED + " INTEGER DEFAULT 0,"
+ Telephony.SimInfo.COLUMN_RCS_CONFIG + " BLOB,"
+ Telephony.SimInfo.COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS + " TEXT,"
- + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING + " INTEGER DEFAULT 0,"
+ Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS + " INTEGER DEFAULT 0,"
+ + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING + " INTEGER DEFAULT 0,"
+ Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS + " TEXT"
+ ");";
}
@@ -1620,12 +1613,12 @@
try {
// Try to update the siminfo table. It might not be there.
db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
- + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING
+ + Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS
+ " INTEGER DEFAULT 0;");
} catch (SQLiteException e) {
if (DBG) {
- log("onUpgrade failed to updated " + SIMINFO_TABLE
- + " to add d2d status sharing column. ");
+ log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. "
+ + "The table will get created in onOpen.");
}
}
oldVersion = 49 << 16 | 6;
@@ -1635,12 +1628,12 @@
try {
// Try to update the siminfo table. It might not be there.
db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
- + Telephony.SimInfo.COLUMN_VOIMS_OPT_IN_STATUS
+ + Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING
+ " INTEGER DEFAULT 0;");
} catch (SQLiteException e) {
if (DBG) {
- log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
- "The table will get created in onOpen.");
+ log("onUpgrade failed to updated " + SIMINFO_TABLE
+ + " to add d2d status sharing column. ");
}
}
oldVersion = 50 << 16 | 6;
@@ -2864,10 +2857,10 @@
boolean isNewBuild = false;
String newBuildId = SystemProperties.get("ro.build.id", null);
+ SharedPreferences sp = getContext().getSharedPreferences(BUILD_ID_FILE,
+ Context.MODE_PRIVATE);
if (!TextUtils.isEmpty(newBuildId)) {
// Check if build id has changed
- SharedPreferences sp = getContext().getSharedPreferences(BUILD_ID_FILE,
- Context.MODE_PRIVATE);
String oldBuildId = sp.getString(RO_BUILD_ID, "");
if (!newBuildId.equals(oldBuildId)) {
localLog("onCreate: build id changed from " + oldBuildId + " to " + newBuildId);
@@ -2875,7 +2868,6 @@
} else {
if (VDBG) log("onCreate: build id did not change: " + oldBuildId);
}
- sp.edit().putString(RO_BUILD_ID, newBuildId).apply();
} else {
if (VDBG) log("onCreate: newBuildId is empty");
}
@@ -2890,9 +2882,15 @@
if (DBG) addAllApnSharedPrefToLocalLog();
}
- SharedPreferences sp = getContext().getSharedPreferences(ENFORCED_FILE,
+ // Write build id to SharedPreferences after APNs have been updated above by updateApnDb()
+ if (!TextUtils.isEmpty(newBuildId)) {
+ if (isNewBuild) log("onCreate: updating build id to " + newBuildId);
+ sp.edit().putString(RO_BUILD_ID, newBuildId).apply();
+ }
+
+ SharedPreferences spEnforcedFile = getContext().getSharedPreferences(ENFORCED_FILE,
Context.MODE_PRIVATE);
- mManagedApnEnforced = sp.getBoolean(ENFORCED_KEY, false);
+ mManagedApnEnforced = spEnforcedFile.getBoolean(ENFORCED_KEY, false);
if (VDBG) log("onCreate:- ret true");
@@ -3635,6 +3633,7 @@
checkPermissionCompat(match, projectionIn);
switch (match) {
case URL_TELEPHONY_USING_SUBID: {
+ // The behaves exactly same as URL_SIM_APN_LIST_ID.
subIdString = url.getLastPathSegment();
try {
subId = Integer.parseInt(subIdString);
@@ -3643,13 +3642,13 @@
return null;
}
if (DBG) log("subIdString = " + subIdString + " subId = " + subId);
- TelephonyManager telephonyManager = getContext()
- .getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
- constraints.add(NUMERIC + " = '" + telephonyManager.getSimOperator() + "'");
+ qb.appendWhereStandalone(IS_NOT_OWNED_BY_DPC);
+ return getSubscriptionMatchingAPNList(qb, projectionIn, selection, selectionArgs,
+ sort, subId);
+
// TODO b/74213956 turn this back on once insertion includes correct sub id
// constraints.add(SUBSCRIPTION_ID + "=" + subIdString);
}
- // intentional fall through from above case
case URL_TELEPHONY: {
constraints.add(IS_NOT_OWNED_BY_DPC);
break;
@@ -3908,10 +3907,19 @@
data.add(ret.getString(ret.getColumnIndex(column)));
}
+ boolean isCurrentSimOperator;
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ isCurrentSimOperator = tm.matchesCurrentSimOperator(
+ ret.getString(numericIndex),
+ getMvnoTypeIntFromString(ret.getString(mvnoIndex)),
+ ret.getString(mvnoDataIndex));
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+
boolean isMVNOAPN = !TextUtils.isEmpty(ret.getString(numericIndex))
- && tm.matchesCurrentSimOperator(ret.getString(numericIndex),
- getMvnoTypeIntFromString(ret.getString(mvnoIndex)),
- ret.getString(mvnoDataIndex));
+ && isCurrentSimOperator;
boolean isMNOAPN = !TextUtils.isEmpty(ret.getString(numericIndex))
&& ret.getString(numericIndex).equals(mccmnc)
&& TextUtils.isEmpty(ret.getString(mvnoIndex));
@@ -4682,14 +4690,18 @@
TelephonyManager telephonyManager =
(TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
- for (String pkg : packages) {
- if (telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(pkg) ==
+ final long token = Binder.clearCallingIdentity();
+ try {
+ for (String pkg : packages) {
+ if (telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(pkg) ==
TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
- return;
+ return;
+ }
}
+ } finally {
+ Binder.restoreCallingIdentity(token);
}
-
throw new SecurityException("No permission to access APN settings");
}
diff --git a/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java b/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
index 00bb15e..f8cc8a6 100644
--- a/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyBackupAgentTest.java
@@ -635,12 +635,16 @@
return false;
}
};
- mTelephonyBackupAgent.setSmsProviderQuery(smsProviderQuery);
-
- mTelephonyBackupAgent.putSmsMessagesToProvider(jsonReader);
- // the "- 1" is due to exception thrown for one of the messages
- assertEquals(mSmsRows.length - 1, smsProvider.getRowsAdded());
- assertEquals(mThreadProvider.mIsThreadArchived, mThreadProvider.mUpdateThreadsArchived);
+ TelephonyBackupAgent.SmsProviderQuery previousQuery =
+ mTelephonyBackupAgent.getAndSetSmsProviderQuery(smsProviderQuery);
+ try {
+ mTelephonyBackupAgent.putSmsMessagesToProvider(jsonReader);
+ // the "- 1" is due to exception thrown for one of the messages
+ assertEquals(mSmsRows.length - 1, smsProvider.getRowsAdded());
+ assertEquals(mThreadProvider.mIsThreadArchived, mThreadProvider.mUpdateThreadsArchived);
+ } finally {
+ mTelephonyBackupAgent.getAndSetSmsProviderQuery(previousQuery);
+ }
}
/**
diff --git a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
index fe2406f..6f3f842 100644
--- a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
@@ -218,22 +218,6 @@
}
@Test
- public void databaseHelperOnUpgrade_hasD2DStatusSharingField() {
- Log.d(TAG, "databaseHelperOnUpgrade_hasD2DStatusSharingField");
- // (5 << 16 | 6) is the first upgrade trigger in onUpgrade
- SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
- mHelper.onUpgrade(db, (4 << 16), TelephonyProvider.getVersion(mContext));
-
- // the upgraded db must have the Telephony.SimInfo.COLUMN_D2D_SHARING_STATUS field
- Cursor cursor = db.query("siminfo", null, null, null, null, null, null);
- String[] upgradedColumns = cursor.getColumnNames();
- Log.d(TAG, "siminfo columns: " + Arrays.toString(upgradedColumns));
-
- assertTrue(Arrays.asList(upgradedColumns).contains(
- Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING));
- }
-
- @Test
public void databaseHelperOnUpgrade_hasVoImsOptInStatusField() {
Log.d(TAG, "databaseHelperOnUpgrade_hasImsRcsUceEnabledField");
// (5 << 16) is the first upgrade trigger in onUpgrade
@@ -250,6 +234,22 @@
}
@Test
+ public void databaseHelperOnUpgrade_hasD2DStatusSharingField() {
+ Log.d(TAG, "databaseHelperOnUpgrade_hasD2DStatusSharingField");
+ // (5 << 16 | 6) is the first upgrade trigger in onUpgrade
+ SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
+ mHelper.onUpgrade(db, (4 << 16), TelephonyProvider.getVersion(mContext));
+
+ // the upgraded db must have the Telephony.SimInfo.COLUMN_D2D_SHARING_STATUS field
+ Cursor cursor = db.query("siminfo", null, null, null, null, null, null);
+ String[] upgradedColumns = cursor.getColumnNames();
+ Log.d(TAG, "siminfo columns: " + Arrays.toString(upgradedColumns));
+
+ assertTrue(Arrays.asList(upgradedColumns).contains(
+ Telephony.SimInfo.COLUMN_D2D_STATUS_SHARING));
+ }
+
+ @Test
public void databaseHelperOnUpgrade_hasD2DSharingContactsField() {
Log.d(TAG, "databaseHelperOnUpgrade_hasD2DSharingContactsField");
// (5 << 16 | 6) is the first upgrade trigger in onUpgrade