Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060" (9e076a61) · Commits · e / os / android_frameworks_base

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

+10 −5

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

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

		private void restoreSettings(BackupDataInput data, Uri contentUri) {