Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[People Service] Catch potential IllegalArgumentException in the event of a malformed contacts URI" into tm-qpr-dev

Browse Source
This commit is contained in:
Jeff Nainaparampil
2023-03-08 17:43:23 +00:00
committed by Android (Google) Code Review
parent 97f604c6f1 c039eebf35
commit a4845f10cf
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/people/java/com/android/server/people/data/ContactsQueryHelper.java
View File

@@ -152,6 +152,8 @@ class ContactsQueryHelper {
}
} catch (SQLiteException exception) {
Slog.w("SQLite exception when querying contacts.", exception);
} catch (IllegalArgumentException exception) {
Slog.w("Illegal Argument exception when querying contacts.", exception);
}
if (found && lookupKey != null && hasPhoneNumber) {
return queryPhoneNumber(lookupKey);

28
services/tests/servicestests/src/com/android/server/people/data/ContactsQueryHelperTest.java
View File

@@ -91,8 +91,16 @@ public final class ContactsQueryHelperTest {
}
@Test
public void testQueryException_returnsFalse() {
contentProvider.setThrowException(true);
public void testQuerySQLiteException_returnsFalse() {
contentProvider.setThrowSQLiteException(true);
Uri contactUri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, CONTACT_LOOKUP_KEY);
assertFalse(mHelper.query(contactUri.toString()));
}
@Test
public void testQueryIllegalArgumentException_returnsFalse() {
contentProvider.setThrowIllegalArgumentException(true);
Uri contactUri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, CONTACT_LOOKUP_KEY);
assertFalse(mHelper.query(contactUri.toString()));
@@ -178,14 +186,18 @@ public final class ContactsQueryHelperTest {
private class ContactsContentProvider extends MockContentProvider {
private Map<Uri, Cursor> mUriPrefixToCursorMap = new ArrayMap<>();
private boolean throwException = false;
private boolean mThrowSQLiteException = false;
private boolean mThrowIllegalArgumentException = false;
@Override
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
String sortOrder) {
if (throwException) {
if (mThrowSQLiteException) {
throw new SQLiteException();
}
if (mThrowIllegalArgumentException) {
throw new IllegalArgumentException();
}
for (Uri prefixUri : mUriPrefixToCursorMap.keySet()) {
if (uri.isPathPrefixMatch(prefixUri)) {
@@ -195,8 +207,12 @@ public final class ContactsQueryHelperTest {
return mUriPrefixToCursorMap.get(uri);
}
public void setThrowException(boolean throwException) {
this.throwException = throwException;
public void setThrowSQLiteException(boolean throwException) {
this.mThrowSQLiteException = throwException;
}
public void setThrowIllegalArgumentException(boolean throwException) {
this.mThrowIllegalArgumentException = throwException;
}
private void registerCursor(Uri uriPrefix, Cursor cursor) {