summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2019-04-03 11:52:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-03 11:52:23 +0000
commit1c53bca656c6a84ae6bdfdf85e26b362b88cde79 (patch)
treef602a3ce8ae816883c09f19bcba0008c9c0b98ac /core/java/android
parent607a13d9d1d25b3c1ead0ec29aac3186f74f2834 (diff)
parent7fb5aca05d01ccc753c29e043e8f44144416d62c (diff)
Merge "Greylist IActivityTaskManagerSingleton."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityTaskManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityTaskManager.java b/core/java/android/app/ActivityTaskManager.java
index 7eab5dba5f82..4ef554dc64cc 100644
--- a/core/java/android/app/ActivityTaskManager.java
+++ b/core/java/android/app/ActivityTaskManager.java
@@ -19,6 +19,7 @@ package android.app;
import android.annotation.RequiresPermission;
import android.annotation.SystemService;
import android.annotation.TestApi;
+import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -146,6 +147,7 @@ public class ActivityTaskManager {
return IActivityTaskManagerSingleton.get();
}
+ @UnsupportedAppUsage(trackingBug = 129726065)
private static final Singleton<IActivityTaskManager> IActivityTaskManagerSingleton =
new Singleton<IActivityTaskManager>() {
@Override