Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98dbecb4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Close dangling cursor"

parents 99d28ac1 2377082f

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

+21 −19
Original line number Diff line number Diff line
@@ -652,9 +652,10 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
            return Collections.emptySet();

        }



        Cursor cursor = getContentResolver().query(settingsUri, new String[] {

                Settings.NameValueTable.NAME, Settings.NameValueTable.IS_PRESERVED_IN_RESTORE },

                /* selection */ null, /* selectionArgs */ null, /* sortOrder */ null);

        try (Cursor cursor = getContentResolver().query(settingsUri, new String[]{

                        Settings.NameValueTable.NAME,

                        Settings.NameValueTable.IS_PRESERVED_IN_RESTORE},

                /* selection */ null, /* selectionArgs */ null, /* sortOrder */ null)) {



            if (!cursor.moveToFirst()) {

                Slog.i(TAG, "No settings to be preserved in restore");
@@ -676,6 +677,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { 


            return preservedSettings;

        }

    }



    /**

     * Serialize the owner info and other lock settings