resolved conflicts for merge of 6825c478 to master

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import static android.content.Context.USER_SERVICE;

import static android.Manifest.permission.READ_PROFILE;

import android.database.Cursor;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteOpenHelper;

        mContext.checkCallingOrSelfPermission(PERMISSION);

    }

    private final void checkReadPermission(String requestedKey, int userId) {

        final int callingUid = Binder.getCallingUid();

        for (int i = 0; i < READ_PROFILE_PROTECTED_SETTINGS.length; i++) {

            String key = READ_PROFILE_PROTECTED_SETTINGS[i];

            if (key.equals(requestedKey) && mContext.checkCallingOrSelfPermission(READ_PROFILE)

                    != PackageManager.PERMISSION_GRANTED) {

                throw new SecurityException("uid=" + callingUid

                        + " needs permission " + READ_PROFILE + " to read "

                        + requestedKey + " for user " + userId);

            }

        }

    }

    @Override

    public void setBoolean(String key, boolean value, int userId) throws RemoteException {

        checkWritePermission(userId);

    @Override

    public boolean getBoolean(String key, boolean defaultValue, int userId) throws RemoteException {

        //checkReadPermission(userId);

        checkReadPermission(key, userId);

        String value = readFromDb(key, null, userId);

        return TextUtils.isEmpty(value) ?

    @Override

    public long getLong(String key, long defaultValue, int userId) throws RemoteException {

        //checkReadPermission(userId);

        checkReadPermission(key, userId);

        String value = readFromDb(key, null, userId);

        return TextUtils.isEmpty(value) ? defaultValue : Long.parseLong(value);

    @Override

    public String getString(String key, String defaultValue, int userId) throws RemoteException {

        //checkReadPermission(userId);

        checkReadPermission(key, userId);

        return readFromDb(key, defaultValue, userId);

    }

        Secure.LOCK_SCREEN_OWNER_INFO_ENABLED,

        Secure.LOCK_SCREEN_OWNER_INFO

    };

    // These are protected with a read permission

    private static final String[] READ_PROFILE_PROTECTED_SETTINGS = MIGRATE_SETTINGS_PER_USER;

}