PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge cherrypicks of [3389033, 3388635, 3389278, 3389279] into pi-release

Browse Source 
Change-Id: I71ce85b48a79247853bc212b334012a1f30ef92a
This commit is contained in:
android-build-team Robot
2017-12-21 04:17:51 +00:00
parent 9909c6b30b 6694854dc0
commit ab0805ef2d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/search/indexing/PreIndexDataCollector.java
View File

@@ -287,8 +287,14 @@ public class PreIndexDataCollector {
String[] projection) {
final ContentResolver resolver = packageContext.getContentResolver();
final Cursor cursor = resolver.query(uri, projection, null, null, null);
final List<String> result = new ArrayList<>();
Cursor cursor;
try {
cursor = resolver.query(uri, projection, null, null, null);
} catch (NullPointerException e) {
Log.e(TAG, "Exception querying the keys!", e);
return result;
}
if (cursor == null) {
Log.w(TAG, "Cannot add index data for Uri: " + uri.toString());