Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use fdeCheckPassword error code to indicate pw failure"

Browse Source 
am: d3d564a802

Change-Id: I146b0e7b1b3202b8757740b6c6586027e293f8a2
This commit is contained in:
Paul Crowley
2018-08-08 10:57:05 -07:00
committed by android-build-merger
parent 272c444496 d3d564a802
commit ccce8813bf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/StorageManagerService.java
View File

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