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

Merge "Don't crash settings when out of space." into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-04-29 17:54:33 +00:00
committed by Android (Google) Code Review
parent 7dce005fab ef71f605f3
commit a1fe122b99
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/search/Index.java
View File

@@ -31,6 +31,7 @@ import android.database.DatabaseUtils;
import android.database.MergeCursor; import android.database.MergeCursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteFullException;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.provider.SearchIndexableData; import android.provider.SearchIndexableData;
@@ -1194,6 +1195,7 @@ public class Index {
@Override @Override
protected Void doInBackground(UpdateData... params) { protected Void doInBackground(UpdateData... params) {
try {
final List<SearchIndexableData> dataToUpdate = params[0].dataToUpdate; final List<SearchIndexableData> dataToUpdate = params[0].dataToUpdate;
final List<SearchIndexableData> dataToDelete = params[0].dataToDelete; final List<SearchIndexableData> dataToDelete = params[0].dataToDelete;
final Map<String, List<String>> nonIndexableKeys = params[0].nonIndexableKeys; final Map<String, List<String>> nonIndexableKeys = params[0].nonIndexableKeys;
@@ -1224,6 +1226,9 @@ public class Index {
if (fullIndex) { if (fullIndex) {
IndexDatabaseHelper.setLocaleIndexed(mContext, localeStr); IndexDatabaseHelper.setLocaleIndexed(mContext, localeStr);
} }
} catch (SQLiteFullException e) {
Log.e(LOG_TAG, "Unable to index search, out of space", e);
}
return null; return null;
} }