blob: 8407447fe03610cc9d8a7f843f0c4e9f8eb99df4 [file] [log] [blame]
From 323a88311763b402b04ec4588e8962f97b3a2c75 Mon Sep 17 00:00:00 2001
From: Jackeagle <jackeagle102@gmail.com>
Date: Thu, 25 Apr 2019 05:34:34 +0200
Subject: [PATCH 28/28] 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 d979ede7367..3ad9a2ce8c4 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;
@@ -2263,9 +2262,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.21.0