diff options
| author | Adrian Roos <roosa@google.com> | 2014-08-13 02:06:54 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-08-13 17:24:36 +0000 |
| commit | 2bb8bfd1e85c8359412159fde57dd5722f5be58c (patch) | |
| tree | 393b20c9a0f43fd83ace82eb090d69e29256cfed /services/core/java/com/android/server/trust | |
| parent | 959409b86f04700cb9898e4641b3bc1da30f5cb2 (diff) | |
| download | frameworks_base-2bb8bfd1e85c8359412159fde57dd5722f5be58c.zip frameworks_base-2bb8bfd1e85c8359412159fde57dd5722f5be58c.tar.gz frameworks_base-2bb8bfd1e85c8359412159fde57dd5722f5be58c.tar.bz2 | |
Dismiss bouncer when onTrustInitiatedByUser fires
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.
Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
Diffstat (limited to 'services/core/java/com/android/server/trust')
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustArchive.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/trust/TrustArchive.java b/services/core/java/com/android/server/trust/TrustArchive.java index d4ed86d..7253716 100644 --- a/services/core/java/com/android/server/trust/TrustArchive.java +++ b/services/core/java/com/android/server/trust/TrustArchive.java @@ -129,8 +129,8 @@ public class TrustArchive { } switch (ev.type) { case TYPE_GRANT_TRUST: - writer.printf(", message=\"%s\", duration=%s", - ev.message, formatDuration(ev.duration)); + writer.printf(", message=\"%s\", duration=%s, initiatedByUser=%d", + ev.message, formatDuration(ev.duration), ev.userInitiated ? 1 : 0); break; case TYPE_MANAGING_TRUST: writer.printf(", managingTrust=" + ev.managingTrust); |