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

Merge "Remove unnecessary pending temp allow list in ATM" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-04-19 01:00:55 +00:00
committed by Android (Google) Code Review
parent bfb8c9e1df 96330eec18
commit 5b19566d7a
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/PendingTempAllowlists.java
View File

@@ -16,8 +16,6 @@
package com.android.server.am; package com.android.server.am;
import static android.os.Process.INVALID_UID;
import android.util.SparseArray; import android.util.SparseArray;
/** Allowlists of uids to temporarily bypass Power Save mode. */ /** Allowlists of uids to temporarily bypass Power Save mode. */
@@ -36,16 +34,12 @@ final class PendingTempAllowlists {
synchronized (mPendingTempAllowlist) { synchronized (mPendingTempAllowlist) {
mPendingTempAllowlist.put(uid, value); mPendingTempAllowlist.put(uid, value);
} }
mService.mAtmInternal.onUidAddedToPendingTempAllowlist(uid, value.tag);
} }
void removeAt(int index) { void removeAt(int index) {
int uid = INVALID_UID;
synchronized (mPendingTempAllowlist) { synchronized (mPendingTempAllowlist) {
uid = mPendingTempAllowlist.keyAt(index);
mPendingTempAllowlist.removeAt(index); mPendingTempAllowlist.removeAt(index);
} }
mService.mAtmInternal.onUidRemovedFromPendingTempAllowlist(uid);
} }
ActivityManagerService.PendingTempAllowlist get(int uid) { ActivityManagerService.PendingTempAllowlist get(int uid) {

3
services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
View File

@@ -512,9 +512,6 @@ public abstract class ActivityTaskManagerInternal {
public abstract void onUidInactive(int uid); public abstract void onUidInactive(int uid);
public abstract void onUidProcStateChanged(int uid, int procState); public abstract void onUidProcStateChanged(int uid, int procState);
public abstract void onUidAddedToPendingTempAllowlist(int uid, String tag);
public abstract void onUidRemovedFromPendingTempAllowlist(int uid);
/** Handle app crash event in {@link android.app.IActivityController} if there is one. */ /** Handle app crash event in {@link android.app.IActivityController} if there is one. */
public abstract boolean handleAppCrashInActivityController(String processName, int pid, public abstract boolean handleAppCrashInActivityController(String processName, int pid,
String shortMsg, String longMsg, long timeMillis, String stackTrace, String shortMsg, String longMsg, long timeMillis, String stackTrace,

17
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -62,7 +62,6 @@ import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIV
import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RTL; import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RTL;
import static android.provider.Settings.Global.HIDE_ERROR_DIALOGS; import static android.provider.Settings.Global.HIDE_ERROR_DIALOGS;
import static android.provider.Settings.System.FONT_SCALE; import static android.provider.Settings.System.FONT_SCALE;
import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.INVALID_DISPLAY; import static android.view.Display.INVALID_DISPLAY;
import static android.view.WindowManager.TRANSIT_WAKE; import static android.view.WindowManager.TRANSIT_WAKE;
@@ -284,7 +283,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -382,7 +380,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
private AppOpsManager mAppOpsManager; private AppOpsManager mAppOpsManager;
/** All active uids in the system. */ /** All active uids in the system. */
final MirrorActiveUids mActiveUids = new MirrorActiveUids(); final MirrorActiveUids mActiveUids = new MirrorActiveUids();
private final SparseArray<String> mPendingTempAllowlist = new SparseArray<>();
/** All processes currently running that might have a window organized by name. */ /** All processes currently running that might have a window organized by name. */
final ProcessMap<WindowProcessController> mProcessNames = new ProcessMap<>(); final ProcessMap<WindowProcessController> mProcessNames = new ProcessMap<>();
/** All processes we currently have running mapped by pid and uid */ /** All processes we currently have running mapped by pid and uid */
@@ -6438,20 +6435,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
mActiveUids.onUidProcStateChanged(uid, procState); mActiveUids.onUidProcStateChanged(uid, procState);
} }
@Override
public void onUidAddedToPendingTempAllowlist(int uid, String tag) {
synchronized (mGlobalLockWithoutBoost) {
mPendingTempAllowlist.put(uid, tag);
}
}
@Override
public void onUidRemovedFromPendingTempAllowlist(int uid) {
synchronized (mGlobalLockWithoutBoost) {
mPendingTempAllowlist.remove(uid);
}
}
@Override @Override
public boolean handleAppCrashInActivityController(String processName, int pid, public boolean handleAppCrashInActivityController(String processName, int pid,
String shortMsg, String longMsg, long timeMillis, String stackTrace, String shortMsg, String longMsg, long timeMillis, String stackTrace,