summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2021-04-08 21:43:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-08 21:43:26 +0000
commitaf31a081dcdfc6f3ac356965fadae4ae539adb33 (patch)
tree2dc4752e0354ebce5fa663c1e4b0eec731dfe8e3 /core/java/android
parent0c71f7c0a4d0a4adf04cb1e7cf542953e7aab3ca (diff)
parentda164b6f83ec5fca04a9989e64ff24a98c359e84 (diff)
Merge "reflect libbinder/am split" am: da164b6f83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801 Change-Id: I395ed01c474d9d4604b03877158932cf24d73180
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/IUidObserver.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/IUidObserver.aidl b/core/java/android/app/IUidObserver.aidl
index 7713e25d5ecd..74018a8ab1f8 100644
--- a/core/java/android/app/IUidObserver.aidl
+++ b/core/java/android/app/IUidObserver.aidl
@@ -24,7 +24,7 @@ oneway interface IUidObserver {
// below block of transactions.
// Since these transactions are also called from native code, these must be kept in sync with
- // the ones in frameworks/native/include/binder/IActivityManager.h
+ // the ones in frameworks/native/include_activitymanager/binder/IActivityManager.h
// =============== Beginning of transactions used on native side as well ======================
/**