summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-08-22 23:18:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-22 23:18:16 +0000
commit7d95c50fd699d5e3d5567b15b6625521f2bc4404 (patch)
tree9f7f16c1b95a221336be3a18afecfb021b6bd035 /packages/Keyguard
parent882112222542dc4ed01feca92946e63c07aa835c (diff)
parentc7639333f8c42efad80ad9304544c7a892b7d81f (diff)
downloadframeworks_base-7d95c50fd699d5e3d5567b15b6625521f2bc4404.zip
frameworks_base-7d95c50fd699d5e3d5567b15b6625521f2bc4404.tar.gz
frameworks_base-7d95c50fd699d5e3d5567b15b6625521f2bc4404.tar.bz2
am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev
* commit '9af7f4f66652d659fb17f4bc502362f0e6faf175': Update TrustAgentService API after review.
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
index 4ea1c77..c650a0f 100644
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
+++ b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
@@ -76,6 +76,12 @@ public class SampleTrustAgent extends TrustAgentService
}
@Override
+ public void onTrustTimeout() {
+ super.onTrustTimeout();
+ Toast.makeText(this, "onTrustTimeout(): timeout expired", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
public void onUnlockAttempt(boolean successful) {
if (getReportUnlockAttempts(this)) {
Toast.makeText(this, "onUnlockAttempt(successful=" + successful + ")",