summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-05-20 00:50:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-20 00:50:05 +0000
commitfe4e1b655fd2ea99cdb907bc8ce628e747e2ee03 (patch)
tree8efc8507362b5cf6f60eef54d0266dfb02a6b53e /services/core/java
parentce271360daaa566e4d29bb2c827e9c46f54ac092 (diff)
parent577b6f6ae4c41ee5a5b79a82962f38df395e8752 (diff)
downloadframeworks_base-fe4e1b655fd2ea99cdb907bc8ce628e747e2ee03.zip
frameworks_base-fe4e1b655fd2ea99cdb907bc8ce628e747e2ee03.tar.gz
frameworks_base-fe4e1b655fd2ea99cdb907bc8ce628e747e2ee03.tar.bz2
Merge "Fix infinite loop in TrustManagerService exception handler."
Diffstat (limited to 'services/core/java')
-rw-r--r--services/core/java/com/android/server/trust/TrustManagerService.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index c1b9a33..efaa91b 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -324,8 +324,6 @@ public class TrustManagerService extends SystemService {
mTrustListeners.get(i).onTrustChanged(enabled, userId);
} catch (RemoteException e) {
Slog.e(TAG, "Exception while notifying TrustListener. Removing listener.", e);
- mTrustListeners.get(i);
- i--;
}
}
}