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

Commit d3d564a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use fdeCheckPassword error code to indicate pw failure"

parents 8f990935 fc0b5193

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;