Projects >> android-frameworks-base-with-screenshot-tweaks >>9ab66ff42f3a03182b18dacaf64edc38fae103cd

Chunk
Conflicting content
        }
    }

<<<<<<< HEAD
    private String getMetaValue(String key) {
        synchronized (mCacheLock) {
            final SQLiteDatabase db = mOpenHelper.getReadableDatabase();
            Cursor c = db.query(TABLE_META,
                    new String[]{META_VALUE}, META_KEY + "=?", new String[]{key}, null, null, null);
            try {
                if (c.moveToNext()) {
                    return c.getString(0);
                }
                return null;
            } finally {
                c.close();
            }
        }
    }

=======
>>>>>>> 17f95e92eda11b3356d4900927828cd61c53e08f
    public IBinder onBind(Intent intent) {
        return asBinder();
    }
Solution content
        }
    }

    public IBinder onBind(Intent intent) {
        return asBinder();
    }
File
AccountManagerService.java
Developer's decision
Version 2
Kind of conflict
Method declaration