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

Merge "ActivityManager: Use the default UidObserver implementation (2)." into udc-dev

Browse Source
This commit is contained in:
Austin Borger
2023-04-06 05:26:55 +00:00
committed by Android (Google) Code Review
parent 6b550d94af 16d7984691
commit 4fdb884bcb
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -59,12 +59,12 @@ import android.app.IActivityManager;
import android.app.IActivityTaskManager;
import android.app.IProcessObserver;
import android.app.IStopUserCallback;
import android.app.IUidObserver;
import android.app.IUserSwitchObserver;
import android.app.KeyguardManager;
import android.app.ProcessStateEnum;
import android.app.ProfilerInfo;
import android.app.RemoteServiceException.CrashedByAdbException;
import android.app.UidObserver;
import android.app.UserSwitchObserver;
import android.app.WaitResult;
import android.app.usage.AppStandbyInfo;
@@ -1858,7 +1858,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
return 0;
}
static final class MyUidObserver extends IUidObserver.Stub
static final class MyUidObserver extends UidObserver
implements ActivityManagerService.OomAdjObserver {
final IActivityManager mInterface;
final ActivityManagerService mInternal;
@@ -1883,8 +1883,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@Override
public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability)
throws RemoteException {
public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) {
synchronized (this) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
@@ -1903,7 +1902,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@Override
public void onUidGone(int uid, boolean disabled) throws RemoteException {
public void onUidGone(int uid, boolean disabled) {
synchronized (this) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
@@ -1921,7 +1920,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@Override
public void onUidActive(int uid) throws RemoteException {
public void onUidActive(int uid) {
synchronized (this) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
@@ -1935,7 +1934,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@Override
public void onUidIdle(int uid, boolean disabled) throws RemoteException {
public void onUidIdle(int uid, boolean disabled) {
synchronized (this) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
@@ -1953,7 +1952,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@Override
public void onUidCachedChanged(int uid, boolean cached) throws RemoteException {
public void onUidCachedChanged(int uid, boolean cached) {
synchronized (this) {
final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
@@ -1966,10 +1965,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
}
@Override
public void onUidProcAdjChanged(int uid) throws RemoteException {
}
@Override
public void onOomAdjMessage(String msg) {
synchronized (this) {