Merge "Remove unnecessary RemoteException declaration" (5f52b4df) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/LockSettingsService.java

+135 −139

Original line number	Diff line number	Diff line
		@@ -603,7 +603,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		}

		private void migrateOldData() {
		try {
		// These Settings moved before multi-user was enabled, so we only have to do it for the
		// root user.
		if (getString("migrated", null, 0) == null) {
		@@ -755,9 +754,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		setString("migrated_wear_lockscreen_disabled", "true", 0);
		Slog.i(TAG, "Migrated lockscreen_disabled for Wear devices");
		}
		} catch (RemoteException re) {
		Slog.e(TAG, "Unable to migrate old data", re);
		}
		}

		private void migrateOldDataAfterSystemReady() {
		@@ -868,7 +864,7 @@ public class LockSettingsService extends ILockSettings.Stub {
		}

		@Override
		public boolean getSeparateProfileChallengeEnabled(int userId) throws RemoteException {
		public boolean getSeparateProfileChallengeEnabled(int userId) {
		checkReadPermission(SEPARATE_PROFILE_CHALLENGE_KEY, userId);
		synchronized (mSeparateChallengeLock) {
		return getBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, false, userId);
		@@ -877,7 +873,7 @@ public class LockSettingsService extends ILockSettings.Stub {

		@Override
		public void setSeparateProfileChallengeEnabled(int userId, boolean enabled,
		String managedUserPassword) throws RemoteException {
		String managedUserPassword) {
		checkWritePermission(userId);
		synchronized (mSeparateChallengeLock) {
		setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, enabled, userId);
		@@ -891,19 +887,19 @@ public class LockSettingsService extends ILockSettings.Stub {
		}

		@Override
		public void setBoolean(String key, boolean value, int userId) throws RemoteException {
		public void setBoolean(String key, boolean value, int userId) {
		checkWritePermission(userId);
		setStringUnchecked(key, userId, value ? "1" : "0");
		}

		@Override
		public void setLong(String key, long value, int userId) throws RemoteException {
		public void setLong(String key, long value, int userId) {
		checkWritePermission(userId);
		setStringUnchecked(key, userId, Long.toString(value));
		}

		@Override
		public void setString(String key, String value, int userId) throws RemoteException {
		public void setString(String key, String value, int userId) {
		checkWritePermission(userId);
		setStringUnchecked(key, userId, value);
		}