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

Skip bg PSS collection for apps using a camera

Browse Source 
Bug: 144138979
Test: grant camera appOp and observe logging
Test: use camera app and observe logging
Change-Id: I6422b432f0d6fcf411073c0528a4ee485d46f005
This commit is contained in:
Christopher Tate
2020-07-22 17:48:13 -07:00
parent f806c211b3
commit 5a7e662751
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,6 +291,7 @@ import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.DebugUtils;
import android.util.EventLog;
import android.util.IntArray;
import android.util.Log;
import android.util.Pair;
import android.util.PrintWriterPrinter;
@@ -310,6 +311,7 @@ import android.view.autofill.AutofillManagerInternal;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IAppOpsActiveCallback;
import com.android.internal.app.IAppOpsCallback;
import com.android.internal.app.IAppOpsService;
import com.android.internal.app.ProcessMap;
@@ -656,6 +658,14 @@ public class ActivityManagerService extends IActivityManager.Stub
/** Total # of UID change events dispatched, shown in dumpsys. */
int mUidChangeDispatchCount;
/**
* Uids of apps with current active camera sessions. Access synchronized on
* the IntArray instance itself, and no other locks must be acquired while that
* one is held.
*/
@GuardedBy("mActiveCameraUids")
final IntArray mActiveCameraUids = new IntArray(4);
/**
* Helper class which strips out priority and proto arguments then calls the dump function with
* the appropriate arguments. If priority arguments are omitted, function calls the legacy
@@ -2053,7 +2063,10 @@ public class ActivityManagerService extends IActivityManager.Stub
}
if (proc != null) {
long startTime = SystemClock.currentThreadTimeMillis();
long pss = Debug.getPss(pid, tmp, null);
// skip background PSS calculation of apps that are capturing
// camera imagery
final boolean usingCamera = isCameraActiveForUid(proc.uid);
long pss = usingCamera ? 0 : Debug.getPss(pid, tmp, null);
long endTime = SystemClock.currentThreadTimeMillis();
synchronized (ActivityManagerService.this) {
if (pss != 0 && proc.thread != null && proc.setProcState == procState
@@ -2066,6 +2079,7 @@ public class ActivityManagerService extends IActivityManager.Stub
ProcessList.abortNextPssTime(proc.procStateMemTracker);
if (DEBUG_PSS) Slog.d(TAG_PSS, "Skipped pss collection of " + pid +
": " + (proc.thread == null ? "NO_THREAD " : "") +
(usingCamera ? "CAMERA " : "") +
(proc.pid != pid ? "PID_CHANGED " : "") +
" initState=" + procState + " curState=" +
proc.setProcState + " " +
@@ -2155,6 +2169,14 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
});
final int[] cameraOp = {AppOpsManager.OP_CAMERA};
mAppOpsService.startWatchingActive(cameraOp, new IAppOpsActiveCallback.Stub() {
@Override
public void opActiveChanged(int op, int uid, String packageName, boolean active) {
cameraActiveChanged(uid, active);
}
});
}
public void setWindowManager(WindowManagerService wm) {
@@ -18266,6 +18288,27 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
final void cameraActiveChanged(@UserIdInt int uid, boolean active) {
synchronized (mActiveCameraUids) {
final int curIndex = mActiveCameraUids.indexOf(uid);
if (active) {
if (curIndex < 0) {
mActiveCameraUids.add(uid);
}
} else {
if (curIndex >= 0) {
mActiveCameraUids.remove(curIndex);
}
}
}
}
final boolean isCameraActiveForUid(@UserIdInt int uid) {
synchronized (mActiveCameraUids) {
return mActiveCameraUids.indexOf(uid) >= 0;
}
}
@GuardedBy("this")
final void doStopUidLocked(int uid, final UidRecord uidRec) {
mServices.stopInBackgroundLocked(uid);