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

Commit 86aaaca9 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

Merge "Use fdeCheckPassword error code to indicate pw failure" am: d3d564a8 

am: ccce8813

Change-Id: I6deadba18c72ecb8128a58ebdd0651a9591187da
parents 55ffb426 ccce8813

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

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,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;
@@ -2254,6 +2255,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;