summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2022-04-15 18:37:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-15 18:37:22 +0000
commit9eaceb337ce16d5c4891d13d8ca4657ad007977e (patch)
treeec9bed333652182ce2dd617dadcd213c38dd07d8 /core/java
parent54fd12368942e9a37dd0c97bfdde785b48ac809f (diff)
parent11ca5138aa5abbd0d97542251b6ad4ca63c7844e (diff)
Inform Application thread to block for network rules to be updated. am: 3bad67bf01 am: 11ca5138aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062965 Change-Id: I4b5cf4f949dcf7ead902ba0f7968e5a34d454f14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ActivityManagerInternal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index 45ed6f273068..7ec361922afc 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -587,7 +587,7 @@ public abstract class ActivityManagerInternal {
* @param uid uid
* @param pid pid of the ProcessRecord that is pending top.
*/
- public abstract void addPendingTopUid(int uid, int pid);
+ public abstract void addPendingTopUid(int uid, int pid, @Nullable IApplicationThread thread);
/**
* Delete uid from the ActivityManagerService PendingStartActivityUids list.