Merge "Describe in which cases getLast* methods return -1/null" (90fbb634) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+37 −37

Original line number	Diff line number	Diff line
		@@ -2854,7 +2854,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no access
		*
		* @see #getLastAccessForegroundTime(int)
		* @see #getLastAccessBackgroundTime(int)
		@@ -2871,7 +2871,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no foreground access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessBackgroundTime(int)
		@@ -2889,7 +2889,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no background access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessForegroundTime(int)
		@@ -2906,7 +2906,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the last access event of {@code null}
		* @return the last access event of {@code null} if there was no access
		*/
		private @Nullable NoteOpEvent getLastAccessEvent(@UidState int fromUidState,
		@UidState int toUidState, @OpFlags int flags) {
		@@ -2921,7 +2921,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessForegroundTime(int)
		@@ -2944,7 +2944,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no rejection
		*
		* @see #getLastRejectForegroundTime(int)
		* @see #getLastRejectBackgroundTime(int)
		@@ -2961,7 +2961,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no foreground rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectBackgroundTime(int)
		@@ -2979,7 +2979,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no background rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectForegroundTime(int)
		@@ -2996,8 +2996,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* @return the last rejection event of {@code null} if there was no rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectForegroundTime(int)
		@@ -3016,7 +3015,8 @@ public class AppOpsManager {
		* @param toUidState The highest UID state for which to query (inclusive)
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch) or {@code -1}
		* @return the last access time (in milliseconds since epoch) or {@code -1} if there was no
		* rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectForegroundTime(int)
		@@ -3039,7 +3039,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no rejection
		*
		* @see #getLastForegroundDuration(int)
		* @see #getLastBackgroundDuration(int)
		@@ -3055,7 +3055,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no foreground rejection
		*
		* @see #getLastDuration(int)
		* @see #getLastBackgroundDuration(int)
		@@ -3072,7 +3072,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no background rejection
		*
		* @see #getLastDuration(int)
		* @see #getLastForegroundDuration(int)
		@@ -3091,7 +3091,7 @@ public class AppOpsManager {
		* @param toUidState The highest UID state for which to query (inclusive)
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no rejection
		*
		* @see #getLastDuration(int)
		* @see #getLastForegroundDuration(int)
		@@ -3115,7 +3115,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy access
		*
		* @see #getLastForegroundProxyInfo(int)
		* @see #getLastBackgroundProxyInfo(int)
		@@ -3132,7 +3132,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastBackgroundProxyInfo(int)
		@@ -3150,7 +3150,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy background access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastForegroundProxyInfo(int)
		@@ -3170,7 +3170,7 @@ public class AppOpsManager {
		* @param toUidState The highest UID state for which to query (inclusive)
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy foreground access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastForegroundProxyInfo(int)
		@@ -3426,7 +3426,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no access
		*
		* @see #getLastAccessForegroundTime(int)
		* @see #getLastAccessBackgroundTime(int)
		@@ -3443,7 +3443,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no foreground access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessBackgroundTime(int)
		@@ -3461,7 +3461,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no background access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessForegroundTime(int)
		@@ -3478,7 +3478,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the last access event of {@code null}
		* @return the last access event of {@code null} if there was no access
		*/
		private @Nullable NoteOpEvent getLastAccessEvent(@UidState int fromUidState,
		@UidState int toUidState, @OpFlags int flags) {
		@@ -3504,7 +3504,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last access time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no access
		*
		* @see #getLastAccessTime(int)
		* @see #getLastAccessForegroundTime(int)
		@@ -3540,7 +3540,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no rejection
		*
		* @see #getLastRejectForegroundTime(int)
		* @see #getLastRejectBackgroundTime(int)
		@@ -3557,7 +3557,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no foreground rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectBackgroundTime(int)
		@@ -3575,7 +3575,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no background rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectForegroundTime(int)
		@@ -3592,7 +3592,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the last reject event of {@code null}
		* @return the last reject event of {@code null} if there was no rejection
		*/
		private @Nullable NoteOpEvent getLastRejectEvent(@UidState int fromUidState,
		@UidState int toUidState, @OpFlags int flags) {
		@@ -3618,7 +3618,7 @@ public class AppOpsManager {
		* @param flags The op flags
		*
		* @return the last rejection time (in milliseconds since epoch start (January 1, 1970
		* 00:00:00.000 GMT - Gregorian)) or {@code -1}
		* 00:00:00.000 GMT - Gregorian)) or {@code -1} if there was no rejection
		*
		* @see #getLastRejectTime(int)
		* @see #getLastRejectForegroundTime(int)
		@@ -3662,7 +3662,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no access
		*
		* @see #getLastForegroundDuration(int)
		* @see #getLastBackgroundDuration(int)
		@@ -3678,7 +3678,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no foreground access
		*
		* @see #getLastDuration(int)
		* @see #getLastBackgroundDuration(int)
		@@ -3695,7 +3695,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no background access
		*
		* @see #getLastDuration(int)
		* @see #getLastForegroundDuration(int)
		@@ -3714,7 +3714,7 @@ public class AppOpsManager {
		* @param toUidState The highest UID state for which to query (inclusive)
		* @param flags The op flags
		*
		* @return the duration in milliseconds or {@code -1}
		* @return the duration in milliseconds or {@code -1} if there was no access
		*
		* @see #getLastDuration(int)
		* @see #getLastForegroundDuration(int)
		@@ -3789,7 +3789,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy access
		*
		* @see #getLastForegroundProxyInfo(int)
		* @see #getLastBackgroundProxyInfo(int)
		@@ -3806,7 +3806,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no foreground proxy access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastBackgroundProxyInfo(int)
		@@ -3824,7 +3824,7 @@ public class AppOpsManager {
		*
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no background proxy access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastForegroundProxyInfo(int)
		@@ -3844,7 +3844,7 @@ public class AppOpsManager {
		* @param toUidState The highest UID state for which to query (inclusive)
		* @param flags The op flags
		*
		* @return The proxy name or {@code null}
		* @return The proxy info or {@code null} if there was no proxy access
		*
		* @see #getLastProxyInfo(int)
		* @see #getLastForegroundProxyInfo(int)