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

Commit f047bb59 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... 

Merge "Use fdeCheckPassword error code to indicate pw failure" am: d3d564a8 am: ccce8813 am: 86aaaca9
am: 19dd9876

Change-Id: I38f9a1bb2c14a560e18f3241be09153d4f835506
parents 1ff73729 19dd9876

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;