Merge "Merge "Use fdeCheckPassword error code to indicate pw failure" am:... (19ae5fff) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/StorageManagerService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import android.os.Process;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.ServiceSpecificException;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		@@ -2380,6 +2381,9 @@ class StorageManagerService extends IStorageManager.Stub
		}
		}, DateUtils.SECOND_IN_MILLIS);
		return 0;
		} catch (ServiceSpecificException e) {
		Slog.e(TAG, "fdeCheckPassword failed", e);
		return e.errorCode;
		} catch (Exception e) {
		Slog.wtf(TAG, e);
		return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN;