diff options
| author | 2017-02-06 17:35:04 +0000 | |
|---|---|---|
| committer | 2017-02-06 17:35:09 +0000 | |
| commit | 504ca8e41acc0565e7a9ac722e2bc979876ddd85 (patch) | |
| tree | 5a07c8eec5da9126218c80b2514a049c09d01770 | |
| parent | 5a50d2b12cf8b41286a873aac6a808d36bbc706c (diff) | |
| parent | 739cda8f31e7002724412447140e0b8ae4085c36 (diff) | |
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
| -rw-r--r-- | core/java/android/app/admin/SecurityLog.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 2858991fbdf4..91b87d74694d 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -144,8 +144,7 @@ public class SecurityLog { } /** - * Returns the payload contained in this log. Each call to this method will - * retrieve the next payload item. If no more payload exists, it returns {@code null}. + * Returns the payload contained in this log entry or {@code null} if there is no payload. */ public Object getData() { return mEvent.getData(); |