am ad2cf220: Merge "Remove a call to a deprecated method"
* commit 'ad2cf220a9f05d0cee8670ebc9f963daa788cf85': Remove a call to a deprecated methodmain
commit
88a522cf9b
|
@ -89,8 +89,6 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
|
|||
}
|
||||
|
||||
private synchronized void registerObserver(final Context context) {
|
||||
// Perform a managed query. The Activity will handle closing and requerying the cursor
|
||||
// when needed.
|
||||
if (mObserver != null) return;
|
||||
ContentResolver cres = context.getContentResolver();
|
||||
cres.registerContentObserver(Contacts.CONTENT_URI, true, mObserver =
|
||||
|
|
|
@ -97,8 +97,6 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
|
|||
mLocale = localeStr;
|
||||
}
|
||||
mAlsoUseMoreRestrictiveLocales = alsoUseMoreRestrictiveLocales;
|
||||
// Perform a managed query. The Activity will handle closing and re-querying the cursor
|
||||
// when needed.
|
||||
ContentResolver cres = context.getContentResolver();
|
||||
|
||||
mObserver = new ContentObserver(null) {
|
||||
|
|
|
@ -53,8 +53,7 @@ public class UserDictionaryList extends PreferenceFragment {
|
|||
}
|
||||
|
||||
public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
|
||||
@SuppressWarnings("deprecation")
|
||||
final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
|
||||
final Cursor cursor = activity.getContentResolver().query(UserDictionary.Words.CONTENT_URI,
|
||||
new String[] { UserDictionary.Words.LOCALE },
|
||||
null, null, null);
|
||||
final TreeSet<String> localeSet = new TreeSet<String>();
|
||||
|
|
|
@ -141,7 +141,10 @@ public class UserDictionarySettings extends ListFragment {
|
|||
|
||||
mLocale = locale;
|
||||
// WARNING: The following cursor is never closed! TODO: don't put that in a member, and
|
||||
// make sure all cursors are correctly closed.
|
||||
// make sure all cursors are correctly closed. Also, this comes from a call to
|
||||
// Activity#managedQuery, which has been deprecated for a long time (and which FORBIDS
|
||||
// closing the cursor, so take care when resolving this TODO). We should either use a
|
||||
// regular query and close the cursor, or switch to a LoaderManager and a CursorLoader.
|
||||
mCursor = createCursor(locale);
|
||||
TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
|
||||
emptyView.setText(R.string.user_dict_settings_empty_text);
|
||||
|
|
Loading…
Reference in New Issue