blob: 8407447fe03610cc9d8a7f843f0c4e9f8eb99df4 [file] [log] [blame]
Jackeagle5b8a0da2019-04-25 06:24:48 +02001From 323a88311763b402b04ec4588e8962f97b3a2c75 Mon Sep 17 00:00:00 2001
2From: Jackeagle <jackeagle102@gmail.com>
3Date: Thu, 25 Apr 2019 05:34:34 +0200
4Subject: [PATCH 28/28] Revert "Use fdeCheckPassword error code to indicate pw
5 failure"
6
7This reverts commit 604396bf8dd83a2d4c210f8d029b871d9838af32.
8---
9 .../core/java/com/android/server/StorageManagerService.java | 4 ----
10 1 file changed, 4 deletions(-)
11
12diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
13index d979ede7367..3ad9a2ce8c4 100644
14--- a/services/core/java/com/android/server/StorageManagerService.java
15+++ b/services/core/java/com/android/server/StorageManagerService.java
16@@ -81,7 +81,6 @@ import android.os.Process;
17 import android.os.RemoteCallbackList;
18 import android.os.RemoteException;
19 import android.os.ServiceManager;
20-import android.os.ServiceSpecificException;
21 import android.os.SystemClock;
22 import android.os.SystemProperties;
23 import android.os.UserHandle;
24@@ -2263,9 +2262,6 @@ class StorageManagerService extends IStorageManager.Stub
25 }
26 }, DateUtils.SECOND_IN_MILLIS);
27 return 0;
28- } catch (ServiceSpecificException e) {
29- Slog.e(TAG, "fdeCheckPassword failed", e);
30- return e.errorCode;
31 } catch (Exception e) {
32 Slog.wtf(TAG, e);
33 return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN;
34--
352.21.0
36