Fix Cursor leak in SettingsBackupAgent. (1d8e7d64) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -350,16 +350,21 @@ public class SettingsBackupAgent extends BackupAgentHelper {
	private byte[] getSystemSettings() {		private byte[] getSystemSettings() {
	Cursor cursor = getContentResolver().query(Settings.System.CONTENT_URI, PROJECTION, null,		Cursor cursor = getContentResolver().query(Settings.System.CONTENT_URI, PROJECTION, null,
	null, null);		null, null);
	byte[] result = extractRelevantValues(cursor, Settings.System.SETTINGS_TO_BACKUP);		try {
			return extractRelevantValues(cursor, Settings.System.SETTINGS_TO_BACKUP);
			} finally {
	cursor.close();		cursor.close();
	return result;		}
	}		}

	private byte[] getSecureSettings() {		private byte[] getSecureSettings() {
	Cursor cursor = getContentResolver().query(Settings.Secure.CONTENT_URI, PROJECTION, null,		Cursor cursor = getContentResolver().query(Settings.Secure.CONTENT_URI, PROJECTION, null,
	null, null);		null, null);
	byte[] result = extractRelevantValues(cursor, Settings.Secure.SETTINGS_TO_BACKUP);		try {
	return result;		return extractRelevantValues(cursor, Settings.Secure.SETTINGS_TO_BACKUP);
			} finally {
			cursor.close();
			}
	}		}

	private void restoreSettings(BackupDataInput data, Uri contentUri) {		private void restoreSettings(BackupDataInput data, Uri contentUri) {