diff options
| author | Varun Shah <varunshah@google.com> | 2019-02-26 22:13:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-26 22:13:20 +0000 |
| commit | ea548cc3ab5ef2782d08243358d6463f17c7627a (patch) | |
| tree | c736b50b54ce16fde5922bf1a228dbed16b29dd1 /core/java | |
| parent | 652081146ad75574615f8aed45b3f9c75a41fc59 (diff) | |
| parent | 9c16989014411058e0e4c9e6fcfa2ca08f9fc098 (diff) | |
Merge "Updated Nullable annotation for #registerAppUsageLimitObserver."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/usage/UsageStatsManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index dc5bdc673249..9c6bd927dd56 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -779,7 +779,7 @@ public final class UsageStatsManager { android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void registerAppUsageLimitObserver(int observerId, @NonNull String[] observedEntities, - long timeLimit, @NonNull TimeUnit timeUnit, PendingIntent callbackIntent) { + long timeLimit, @NonNull TimeUnit timeUnit, @Nullable PendingIntent callbackIntent) { try { mService.registerAppUsageLimitObserver(observerId, observedEntities, timeUnit.toMillis(timeLimit), callbackIntent, mContext.getOpPackageName()); |