Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fa80ba8 authored by Andrew Scull's avatar Andrew Scull Committed by Android (Google) Code Review
Browse files

Merge "Move LockSettingsService into locksettings package."

parents abb3f115 507d11c9

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

+5 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.locksettings;



import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE;

import static android.Manifest.permission.READ_CONTACTS;
@@ -84,9 +84,10 @@ import com.android.internal.widget.ICheckCredentialProgressCallback; 
import com.android.internal.widget.ILockSettings;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.VerifyCredentialResponse;

import com.android.server.LockSettingsStorage.CredentialHash;

import com.android.server.SyntheticPasswordManager.AuthenticationResult;

import com.android.server.SyntheticPasswordManager.AuthenticationToken;

import com.android.server.SystemService;

import com.android.server.locksettings.LockSettingsStorage.CredentialHash;

import com.android.server.locksettings.SyntheticPasswordManager.AuthenticationResult;

import com.android.server.locksettings.SyntheticPasswordManager.AuthenticationToken;



import libcore.util.HexEncoding;

services/core/java/com/android/server/LockSettingsShellCommand.java→services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.server;

package com.android.server.locksettings;



import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;

services/core/java/com/android/server/LockSettingsStorage.java→services/core/java/com/android/server/locksettings/LockSettingsStorage.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.server;

package com.android.server.locksettings;



import static android.content.Context.USER_SERVICE;

services/core/java/com/android/server/LockSettingsStrongAuth.java→services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.server;

package com.android.server.locksettings;



import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT;

services/core/java/com/android/server/SyntheticPasswordCrypto.java→services/core/java/com/android/server/locksettings/SyntheticPasswordCrypto.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.locksettings;



import android.security.keystore.KeyProperties;

import android.security.keystore.KeyProtection;