Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjusting javadocs for process logging" into nyc-dev

Browse Source 
am: 31f59f1

* commit '31f59f1106824594ab8d5d48391b785b8687c4b0':
  Adjusting javadocs for process logging

Change-Id: Ia37bd42b2f7dffd71d08515a5d8b93771effbf57
This commit is contained in:
Michal Karpinski
2016-03-31 10:02:57 +00:00
committed by android-build-merger
parent 1478696b1c 31f59f1106
commit 2d884a207b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -5920,7 +5920,7 @@ public class DevicePolicyManager {
* <p> * <p>
* <strong> The device logs are retrieved from a RAM region which is not guaranteed to be * <strong> The device logs are retrieved from a RAM region which is not guaranteed to be
* corruption-free during power cycles, due to hardware variations and limitations. As a result, * corruption-free during power cycles, due to hardware variations and limitations. As a result,
* this API is provided as best-effort and the returned logs may contain corrupted * this API is provided as best-effort and the returned logs may be empty or contain corrupted
* data. </strong> * data. </strong>
* <p> * <p>
* There must be only one user on the device, managed by the device owner. Otherwise a * There must be only one user on the device, managed by the device owner. Otherwise a

2
core/java/android/app/admin/SecurityLog.java
View File

@@ -67,7 +67,7 @@ public class SecurityLog {
* information about the process encapsulated in an {@link Object} array, accessible via * information about the process encapsulated in an {@link Object} array, accessible via
* {@link SecurityEvent#getData()}: * {@link SecurityEvent#getData()}:
* process name (String), exact start time (long), app Uid (integer), app Pid (integer), * process name (String), exact start time (long), app Uid (integer), app Pid (integer),
* seinfo tag (String), SHA-256 hash of the APK in hexadecimal (String) * seinfo tag (String), SHA-256 hash of the base APK in hexadecimal (String)
*/ */
public static final int TAG_APP_PROCESS_START = SecurityLogTags.SECURITY_APP_PROCESS_START; public static final int TAG_APP_PROCESS_START = SecurityLogTags.SECURITY_APP_PROCESS_START;
/** /**