Merge "Lockscreen settings per user" (2184a985) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/view/IInputMethodClient.aidl \
		core/java/com/android/internal/view/IInputMethodManager.aidl \
		core/java/com/android/internal/view/IInputMethodSession.aidl \
		core/java/com/android/internal/widget/ILockSettings.aidl \
		core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
		core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \
		keystore/java/android/security/IKeyChainAliasCallback.aidl \

core/java/android/provider/Settings.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -36,14 +36,19 @@ import android.net.Uri;
		import android.net.wifi.WifiManager;
		import android.os.BatteryManager;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.os.UserId;
		import android.speech.tts.TextToSpeech;
		import android.text.TextUtils;
		import android.util.AndroidException;
		import android.util.Log;
		import android.view.WindowOrientationListener;

		import com.android.internal.widget.ILockSettings;

		import java.net.URISyntaxException;
		import java.util.HashMap;
		import java.util.HashSet;
		@@ -2253,6 +2258,16 @@ public final class Settings {
		// Populated lazily, guarded by class object:
		private static NameValueCache sNameValueCache = null;

		private static ILockSettings sLockSettings = null;

		private static final HashSet<String> MOVED_TO_LOCK_SETTINGS;
		static {
		MOVED_TO_LOCK_SETTINGS = new HashSet<String>(3);
		MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_ENABLED);
		MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_VISIBLE);
		MOVED_TO_LOCK_SETTINGS.add(Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED);
		}

		/**
		* Look up a name in the database.
		* @param resolver to access the database with
		@@ -2264,6 +2279,19 @@ public final class Settings {
		sNameValueCache = new NameValueCache(SYS_PROP_SETTING_VERSION, CONTENT_URI,
		CALL_METHOD_GET_SECURE);
		}

		if (sLockSettings == null) {
		sLockSettings = ILockSettings.Stub.asInterface(
		(IBinder) ServiceManager.getService("lock_settings"));
		}
		if (sLockSettings != null && MOVED_TO_LOCK_SETTINGS.contains(name)) {
		try {
		return sLockSettings.getString(name, "0", UserId.getCallingUserId());
		} catch (RemoteException re) {
		// Fall through
		}
		}

		return sNameValueCache.getString(resolver, name);
		}

core/java/com/android/internal/widget/ILockSettings.aidl

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.widget;

		/** {@hide} */
		interface ILockSettings {
		void setBoolean(in String key, in boolean value, in int userId);
		void setLong(in String key, in long value, in int userId);
		void setString(in String key, in String value, in int userId);
		boolean getBoolean(in String key, in boolean defaultValue, in int userId);
		long getLong(in String key, in long defaultValue, in int userId);
		String getString(in String key, in String defaultValue, in int userId);
		void setLockPattern(in byte[] hash, int userId);
		boolean checkPattern(in byte[] hash, int userId);
		void setLockPassword(in byte[] hash, int userId);
		boolean checkPassword(in byte[] hash, int userId);
		boolean havePattern(int userId);
		boolean havePassword(int userId);
		void removeUser(int userId);
		}

core/java/com/android/internal/widget/LockPatternUtils.java

+107 −117

Original line number	Diff line number	Diff line
		@@ -21,15 +21,20 @@ import com.android.internal.telephony.ITelephony;
		import com.google.android.collect.Lists;

		import android.app.admin.DevicePolicyManager;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManager;
		import android.os.Binder;
		import android.os.FileObserver;
		import android.os.IBinder;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		import android.os.UserId;
		import android.os.storage.IMountService;
		import android.provider.Settings;
		import android.security.KeyStore;
		@@ -59,10 +64,6 @@ public class LockPatternUtils {

		private static final String TAG = "LockPatternUtils";

		private static final String SYSTEM_DIRECTORY = "/system/";
		private static final String LOCK_PATTERN_FILE = "gesture.key";
		private static final String LOCK_PASSWORD_FILE = "password.key";

		/**
		* The maximum number of incorrect attempts before the user is prevented
		* from trying again for {@link #FAILED_ATTEMPT_TIMEOUT_MS}.
		@@ -111,14 +112,14 @@ public class LockPatternUtils {
		*/
		public static final int FLAG_BIOMETRIC_WEAK_LIVELINESS = 0x1;

		private final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently";
		private final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline";
		private final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen";
		protected final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently";
		protected final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline";
		protected final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen";
		public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type";
		public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate";
		private final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt";
		private final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled";
		private final static String LOCKSCREEN_OPTIONS = "lockscreen.options";
		protected final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt";
		protected final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled";
		protected final static String LOCKSCREEN_OPTIONS = "lockscreen.options";
		public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK
		= "lockscreen.biometric_weak_fallback";
		public final static String BIOMETRIC_WEAK_EVER_CHOSEN_KEY
		@@ -126,35 +127,13 @@ public class LockPatternUtils {
		public final static String LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS
		= "lockscreen.power_button_instantly_locks";

		private final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory";
		protected final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory";

		private final Context mContext;
		private final ContentResolver mContentResolver;
		private DevicePolicyManager mDevicePolicyManager;
		private static String sLockPatternFilename;
		private static String sLockPasswordFilename;

		private static final AtomicBoolean sHaveNonZeroPatternFile = new AtomicBoolean(false);
		private static final AtomicBoolean sHaveNonZeroPasswordFile = new AtomicBoolean(false);

		private static FileObserver sPasswordObserver;

		private static class PasswordFileObserver extends FileObserver {
		public PasswordFileObserver(String path, int mask) {
		super(path, mask);
		}

		@Override
		public void onEvent(int event, String path) {
		if (LOCK_PATTERN_FILE.equals(path)) {
		Log.d(TAG, "lock pattern file changed");
		sHaveNonZeroPatternFile.set(new File(sLockPatternFilename).length() > 0);
		} else if (LOCK_PASSWORD_FILE.equals(path)) {
		Log.d(TAG, "lock password file changed");
		sHaveNonZeroPasswordFile.set(new File(sLockPasswordFilename).length() > 0);
		}
		}
		}
		private ILockSettings mLockSettingsService;
		private int mCurrentUserId = 0;

		public DevicePolicyManager getDevicePolicyManager() {
		if (mDevicePolicyManager == null) {
		@@ -167,34 +146,27 @@ public class LockPatternUtils {
		}
		return mDevicePolicyManager;
		}

		/**
		* @param contentResolver Used to look up and save settings.
		*/
		public LockPatternUtils(Context context) {
		mContext = context;
		mContentResolver = context.getContentResolver();
		}

		// Initialize the location of gesture & PIN lock files
		if (sLockPatternFilename == null) {
		String dataSystemDirectory =
		android.os.Environment.getDataDirectory().getAbsolutePath() +
		SYSTEM_DIRECTORY;
		sLockPatternFilename = dataSystemDirectory + LOCK_PATTERN_FILE;
		sLockPasswordFilename = dataSystemDirectory + LOCK_PASSWORD_FILE;
		sHaveNonZeroPatternFile.set(new File(sLockPatternFilename).length() > 0);
		sHaveNonZeroPasswordFile.set(new File(sLockPasswordFilename).length() > 0);
		int fileObserverMask = FileObserver.CLOSE_WRITE \| FileObserver.DELETE \|
		FileObserver.MOVED_TO \| FileObserver.CREATE;
		sPasswordObserver = new PasswordFileObserver(dataSystemDirectory, fileObserverMask);
		sPasswordObserver.startWatching();
		private ILockSettings getLockSettings() {
		if (mLockSettingsService == null) {
		mLockSettingsService = ILockSettings.Stub.asInterface(
		(IBinder) ServiceManager.getService("lock_settings"));
		}
		return mLockSettingsService;
		}

		public int getRequestedMinimumPasswordLength() {
		return getDevicePolicyManager().getPasswordMinimumLength(null);
		}


		/**
		* Gets the device policy password mode. If the mode is non-specific, returns
		* MODE_PATTERN which allows the user to choose anything.
		@@ -243,6 +215,33 @@ public class LockPatternUtils {
		getDevicePolicyManager().reportSuccessfulPasswordAttempt();
		}

		public void setCurrentUser(int userId) {
		if (Process.myUid() == Process.SYSTEM_UID) {
		mCurrentUserId = userId;
		} else {
		throw new SecurityException("Only the system process can set the current user");
		}
		}

		public void removeUser(int userId) {
		if (Process.myUid() == Process.SYSTEM_UID) {
		try {
		getLockSettings().removeUser(userId);
		} catch (RemoteException re) {
		Log.e(TAG, "Couldn't remove lock settings for user " + userId);
		}
		}
		}

		private int getCurrentOrCallingUserId() {
		int callingUid = Binder.getCallingUid();
		if (callingUid == android.os.Process.SYSTEM_UID) {
		return mCurrentUserId;
		} else {
		return UserId.getUserId(callingUid);
		}
		}

		/**
		* Check to see if a pattern matches the saved pattern. If no pattern exists,
		* always returns true.
		@@ -250,20 +249,10 @@ public class LockPatternUtils {
		* @return Whether the pattern matches the stored one.
		*/
		public boolean checkPattern(List<LockPatternView.Cell> pattern) {
		int userId = getCurrentOrCallingUserId();
		try {
		// Read all the bytes from the file
		RandomAccessFile raf = new RandomAccessFile(sLockPatternFilename, "r");
		final byte[] stored = new byte[(int) raf.length()];
		int got = raf.read(stored, 0, stored.length);
		raf.close();
		if (got <= 0) {
		return true;
		}
		// Compare the hash from the file with the entered pattern's hash
		return Arrays.equals(stored, LockPatternUtils.patternToHash(pattern));
		} catch (FileNotFoundException fnfe) {
		return true;
		} catch (IOException ioe) {
		return getLockSettings().checkPattern(patternToHash(pattern), userId);
		} catch (RemoteException re) {
		return true;
		}
		}
		@@ -275,20 +264,10 @@ public class LockPatternUtils {
		* @return Whether the password matches the stored one.
		*/
		public boolean checkPassword(String password) {
		int userId = getCurrentOrCallingUserId();
		try {
		// Read all the bytes from the file
		RandomAccessFile raf = new RandomAccessFile(sLockPasswordFilename, "r");
		final byte[] stored = new byte[(int) raf.length()];
		int got = raf.read(stored, 0, stored.length);
		raf.close();
		if (got <= 0) {
		return true;
		}
		// Compare the hash from the file with the entered password's hash
		return Arrays.equals(stored, passwordToHash(password));
		} catch (FileNotFoundException fnfe) {
		return true;
		} catch (IOException ioe) {
		return getLockSettings().checkPassword(passwordToHash(password), userId);
		} catch (RemoteException re) {
		return true;
		}
		}
		@@ -325,7 +304,11 @@ public class LockPatternUtils {
		* @return Whether a saved pattern exists.
		*/
		public boolean savedPatternExists() {
		return sHaveNonZeroPatternFile.get();
		try {
		return getLockSettings().havePattern(getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		return false;
		}
		}

		/**
		@@ -333,7 +316,11 @@ public class LockPatternUtils {
		* @return Whether a saved pattern exists.
		*/
		public boolean savedPasswordExists() {
		return sHaveNonZeroPasswordFile.get();
		try {
		return getLockSettings().havePassword(getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		return false;
		}
		}

		/**
		@@ -471,15 +458,7 @@ public class LockPatternUtils {
		// Compute the hash
		final byte[] hash = LockPatternUtils.patternToHash(pattern);
		try {
		// Write the hash to file
		RandomAccessFile raf = new RandomAccessFile(sLockPatternFilename, "rw");
		// Truncate the file if pattern is null, to clear the lock
		if (pattern == null) {
		raf.setLength(0);
		} else {
		raf.write(hash, 0, hash.length);
		}
		raf.close();
		getLockSettings().setLockPattern(hash, getCurrentOrCallingUserId());
		DevicePolicyManager dpm = getDevicePolicyManager();
		KeyStore keyStore = KeyStore.getInstance();
		if (pattern != null) {
		@@ -505,13 +484,8 @@ public class LockPatternUtils {
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0,
		0, 0, 0, 0, 0);
		}
		} catch (FileNotFoundException fnfe) {
		// Cant do much, unless we want to fail over to using the settings
		// provider
		Log.e(TAG, "Unable to save lock pattern to " + sLockPatternFilename);
		} catch (IOException ioe) {
		// Cant do much
		Log.e(TAG, "Unable to save lock pattern to " + sLockPatternFilename);
		} catch (RemoteException re) {
		Log.e(TAG, "Couldn't save lock pattern " + re);
		}
		}

		@@ -586,15 +560,7 @@ public class LockPatternUtils {
		// Compute the hash
		final byte[] hash = passwordToHash(password);
		try {
		// Write the hash to file
		RandomAccessFile raf = new RandomAccessFile(sLockPasswordFilename, "rw");
		// Truncate the file if pattern is null, to clear the lock
		if (password == null) {
		raf.setLength(0);
		} else {
		raf.write(hash, 0, hash.length);
		}
		raf.close();
		getLockSettings().setLockPassword(hash, getCurrentOrCallingUserId());
		DevicePolicyManager dpm = getDevicePolicyManager();
		KeyStore keyStore = KeyStore.getInstance();
		if (password != null) {
		@@ -676,12 +642,9 @@ public class LockPatternUtils {
		dpm.setActivePasswordState(
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0);
		}
		} catch (FileNotFoundException fnfe) {
		// Cant do much, unless we want to fail over to using the settings provider
		Log.e(TAG, "Unable to save lock pattern to " + sLockPasswordFilename);
		} catch (IOException ioe) {
		} catch (RemoteException re) {
		// Cant do much
		Log.e(TAG, "Unable to save lock pattern to " + sLockPasswordFilename);
		Log.e(TAG, "Unable to save lock password " + re);
		}
		}

		@@ -1013,30 +976,57 @@ public class LockPatternUtils {
		}

		private boolean getBoolean(String secureSettingKey, boolean defaultValue) {
		return 1 ==
		android.provider.Settings.Secure.getInt(mContentResolver, secureSettingKey,
		defaultValue ? 1 : 0);
		try {
		return getLockSettings().getBoolean(secureSettingKey, defaultValue,
		getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		return defaultValue;
		}
		}

		private void setBoolean(String secureSettingKey, boolean enabled) {
		android.provider.Settings.Secure.putInt(mContentResolver, secureSettingKey,
		enabled ? 1 : 0);
		try {
		getLockSettings().setBoolean(secureSettingKey, enabled, getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		// What can we do?
		Log.e(TAG, "Couldn't write boolean " + secureSettingKey + re);
		}
		}

		private long getLong(String secureSettingKey, long def) {
		return android.provider.Settings.Secure.getLong(mContentResolver, secureSettingKey, def);
		private long getLong(String secureSettingKey, long defaultValue) {
		try {
		return getLockSettings().getLong(secureSettingKey, defaultValue,
		getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		return defaultValue;
		}
		}

		private void setLong(String secureSettingKey, long value) {
		android.provider.Settings.Secure.putLong(mContentResolver, secureSettingKey, value);
		try {
		getLockSettings().setLong(secureSettingKey, value, getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		// What can we do?
		Log.e(TAG, "Couldn't write long " + secureSettingKey + re);
		}
		}

		private String getString(String secureSettingKey) {
		return android.provider.Settings.Secure.getString(mContentResolver, secureSettingKey);
		try {
		return getLockSettings().getString(secureSettingKey, null,
		getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		return null;
		}
		}

		private void setString(String secureSettingKey, String value) {
		android.provider.Settings.Secure.putString(mContentResolver, secureSettingKey, value);
		try {
		getLockSettings().setString(secureSettingKey, value, getCurrentOrCallingUserId());
		} catch (RemoteException re) {
		// What can we do?
		Log.e(TAG, "Couldn't write string " + secureSettingKey + re);
		}
		}

		public boolean isSecure() {

core/java/com/android/internal/widget/LockSettingsService.java

0 → 100644

+388 −0

File added.

Preview size limit exceeded, changes collapsed.