Projects >> platform_frameworks_base >>a188e4dc0e7a1505062fd82ea01f3f6e9a555f6b

Chunk
Conflicting content 
            } finally {
        }

        if (upgradeVersion == 71) {
<<<<<<< HEAD
            db.beginTransaction();
            SQLiteStatement stmt = null;
            Cursor c = null;
            try {
                c = db.query("secure", new String[] {"_id", "value"},
                        "name='lockscreen.disabled'",
                        null, null, null, null);
                // only set default if it has not yet been set
                if (c == null || c.getCount() == 0) {
                    stmt = db.compileStatement("INSERT INTO system(name,value)"
                            + " VALUES(?,?);");
                    loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
                            R.bool.def_lockscreen_disabled);
                }
                db.setTransactionSuccessful();
            } finally {
                db.endTransaction();
                if (c != null) c.close();
=======
             // New setting to specify whether to speak passwords in accessibility mode.
            db.beginTransaction();
            SQLiteStatement stmt = null;
            try {
                stmt = db.compileStatement("INSERT INTO secure(name,value)"
                        + " VALUES(?,?);");
                loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
                        R.bool.def_accessibility_speak_password);
                db.endTransaction();
>>>>>>> ea25ea7ef30be14dd940f1667e0308bfff5b4d85
                if (stmt != null) stmt.close();
            }
            upgradeVersion = 72;
Solution content 
        }

        if (upgradeVersion == 71) {
             // New setting to specify whether to speak passwords in accessibility mode.
            db.beginTransaction();
            SQLiteStatement stmt = null;
            try {
                stmt = db.compileStatement("INSERT INTO secure(name,value)"
                        + " VALUES(?,?);");
                loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
                        R.bool.def_accessibility_speak_password);
            } finally {
                db.endTransaction();
                if (stmt != null) stmt.close();
            }
            upgradeVersion = 72;
File
DatabaseHelper.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Try statement
Variable
Chunk
Conflicting content 
            loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,
                    R.bool.def_touch_exploration_enabled);
<<<<<<< HEAD
            loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
                    R.bool.def_lockscreen_disabled);

            loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED,
                    R.bool.def_device_provisioned);
=======

            loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
                    R.bool.def_accessibility_speak_password);
>>>>>>> ea25ea7ef30be14dd940f1667e0308bfff5b4d85
        } finally {
            if (stmt != null) stmt.close();
        }
Solution content 
            loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,
                    R.bool.def_touch_exploration_enabled);

            loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
                    R.bool.def_accessibility_speak_password);

            loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
                    R.bool.def_lockscreen_disabled);

            loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED,
                    R.bool.def_device_provisioned);
        } finally {
            if (stmt != null) stmt.close();
        }
File
DatabaseHelper.java
Developer's decision
Concatenation
Kind of conflict
Method invocation