summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorHui Yu <huiyu@google.com>2022-03-24 15:42:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-03-24 15:42:37 +0000
commit5e90a571ceb260cf9a77b0ba2d974816ec462033 (patch)
treea72c9f78e9820a2e08f082cf7aed09ff6a996325 /core/java/android
parent390f34bb58d998b87df1ee1036293aee76785a24 (diff)
parentbb89d23c33c5595012bdf044855b7baba96e1851 (diff)
Merge "Increase startForeground() timeout to 30 seconds." into tm-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManagerInternal.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index 9fe8e792681c..9c8639d4b7b8 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -684,6 +684,11 @@ public abstract class ActivityManagerInternal {
public abstract @TempAllowListType int getPushMessagingOverQuotaBehavior();
/**
+ * Return the startForeground() grace period after calling startForegroundService().
+ */
+ public abstract int getServiceStartForegroundTimeout();
+
+ /**
* Returns the capability of the given uid
*/
public abstract @ProcessCapability int getUidCapability(int uid);