Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run addUidToObserver and removeUidFromObserver on the handler thread." into udc-dev am: 0bc1b58227

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23591556

Change-Id: I8d1741fa075099096d6ce4b4d6b353fd5f1f724d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Borger
2023-06-08 23:11:25 +00:00
committed by Automerger Merge Worker
parent 56957d4fd3 0bc1b58227
commit 9437d3c0e7
2 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1616,6 +1616,8 @@ public class ActivityManagerService extends IActivityManager.Stub
static final int SERVICE_SHORT_FGS_PROCSTATE_TIMEOUT_MSG = 77;
static final int SERVICE_SHORT_FGS_ANR_TIMEOUT_MSG = 78;
static final int UPDATE_CACHED_APP_HIGH_WATERMARK = 79;
static final int ADD_UID_TO_OBSERVER_MSG = 80;
static final int REMOVE_UID_FROM_OBSERVER_MSG = 81;
static final int FIRST_BROADCAST_QUEUE_MSG = 200;
@@ -1774,6 +1776,12 @@ public class ActivityManagerService extends IActivityManager.Stub
case PUSH_TEMP_ALLOWLIST_UI_MSG: {
pushTempAllowlist();
} break;
case ADD_UID_TO_OBSERVER_MSG: {
mUidObserverController.addUidToObserverImpl((IBinder) msg.obj, msg.arg1);
} break;
case REMOVE_UID_FROM_OBSERVER_MSG: {
mUidObserverController.removeUidFromObserverImpl((IBinder) msg.obj, msg.arg1);
} break;
}
}
}

83
services/core/java/com/android/server/am/UidObserverController.java
View File

@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.SystemClock;
@@ -104,40 +105,62 @@ public class UidObserverController {
}
}
void addUidToObserver(@NonNull IBinder observerToken, int uid) {
synchronized (mLock) {
int i = mUidObservers.beginBroadcast();
while (i-- > 0) {
var reg = (UidObserverRegistration) mUidObservers.getBroadcastCookie(i);
if (reg.getToken().equals(observerToken)) {
reg.addUid(uid);
break;
}
if (i == 0) {
Slog.e(TAG_UID_OBSERVERS, "Unable to find UidObserver by token");
}
}
mUidObservers.finishBroadcast();
}
final void addUidToObserver(@NonNull IBinder observerToken, int uid) {
Message msg = Message.obtain(mHandler, ActivityManagerService.ADD_UID_TO_OBSERVER_MSG,
uid, /*arg2*/ 0, observerToken);
mHandler.sendMessage(msg);
}
void removeUidFromObserver(@NonNull IBinder observerToken, int uid) {
synchronized (mLock) {
int i = mUidObservers.beginBroadcast();
while (i-- > 0) {
var reg = (UidObserverRegistration) mUidObservers.getBroadcastCookie(i);
if (reg.getToken().equals(observerToken)) {
reg.removeUid(uid);
break;
}
if (i == 0) {
Slog.e(TAG_UID_OBSERVERS, "Unable to find UidObserver by token");
}
/**
* Add a uid to the list of uids an observer is interested in. Must be run on the same thread
* as mDispatchRunnable.
*
* @param observerToken The token identifier for a UidObserver
* @param uid The uid to add to the list of watched uids
*/
public final void addUidToObserverImpl(@NonNull IBinder observerToken, int uid) {
int i = mUidObservers.beginBroadcast();
while (i-- > 0) {
var reg = (UidObserverRegistration) mUidObservers.getBroadcastCookie(i);
if (reg.getToken().equals(observerToken)) {
reg.addUid(uid);
break;
}
if (i == 0) {
Slog.e(TAG_UID_OBSERVERS, "Unable to find UidObserver by token");
}
mUidObservers.finishBroadcast();
}
mUidObservers.finishBroadcast();
}
final void removeUidFromObserver(@NonNull IBinder observerToken, int uid) {
Message msg = Message.obtain(mHandler, ActivityManagerService.REMOVE_UID_FROM_OBSERVER_MSG,
uid, /*arg2*/ 0, observerToken);
mHandler.sendMessage(msg);
}
/**
* Remove a uid from the list of uids an observer is interested in. Must be run on the same
* thread as mDispatchRunnable.
*
* @param observerToken The token identifier for a UidObserver
* @param uid The uid to remove from the list of watched uids
*/
public final void removeUidFromObserverImpl(@NonNull IBinder observerToken, int uid) {
int i = mUidObservers.beginBroadcast();
while (i-- > 0) {
var reg = (UidObserverRegistration) mUidObservers.getBroadcastCookie(i);
if (reg.getToken().equals(observerToken)) {
reg.removeUid(uid);
break;
}
if (i == 0) {
Slog.e(TAG_UID_OBSERVERS, "Unable to find UidObserver by token");
}
}
mUidObservers.finishBroadcast();
}
int enqueueUidChange(@Nullable ChangeRecord currentRecord, int uid, int change, int procState,