summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2019-12-24 12:32:03 -0800
committerHall Liu <hallliu@google.com>2019-12-30 16:17:46 -0800
commit1318fd3b7d83ba3d96da35cbb570be95072fb2de (patch)
tree4a7e9e3bd935cdd05ada8c7a26f0f5f6c7dec988
parentfc1d97412b5e4d725ffc74a415dbd5d3d9d2c2dd (diff)
downloadMms-1318fd3b7d83ba3d96da35cbb570be95072fb2de.tar.gz
Stop using SqliteWrapper
Query ContentResolver directly instead of using SqliteWrapper Bug: 146834818 Test: manual Change-Id: I5426ee1e89fa16f969b51ab780f04a1b45d03593
-rw-r--r--src/com/android/mms/service/ApnSettings.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/com/android/mms/service/ApnSettings.java b/src/com/android/mms/service/ApnSettings.java
index 9ecdd70..5f923c9 100644
--- a/src/com/android/mms/service/ApnSettings.java
+++ b/src/com/android/mms/service/ApnSettings.java
@@ -18,7 +18,6 @@ package com.android.mms.service;
import android.content.Context;
import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
import android.net.NetworkUtils;
import android.net.Uri;
import android.provider.Telephony;
@@ -101,14 +100,12 @@ public class ApnSettings {
selectionArgs = new String[]{apnName};
}
- try (Cursor cursor = SqliteWrapper.query(
- context,
- context.getContentResolver(),
- Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subId),
- APN_PROJECTION,
- selection,
- selectionArgs,
- null/*sortOrder*/)) {
+ try (Cursor cursor = context.getContentResolver().query(
+ Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subId),
+ APN_PROJECTION,
+ selection,
+ selectionArgs,
+ null/*sortOrder*/)) {
ApnSettings settings = getApnSettingsFromCursor(cursor, requestId);
if (settings != null) {