blob: 377283665283c1458e64dcfdb79247ae2802dc6d [file] [log] [blame]
From e7c4a836ed99addea828d5fb9a78db1c2dbfee46 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Wed, 19 Dec 2018 17:05:44 +0100
Subject: [PATCH 25/25] Revert "Use fdeCheckPassword error code to indicate pw
failure"
This reverts commit 604396bf8dd83a2d4c210f8d029b871d9838af32.
---
.../core/java/com/android/server/StorageManagerService.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 478949bbba0..14ca559c306 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -81,7 +81,6 @@ 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;
@@ -2262,9 +2261,6 @@ 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;
--
2.17.1