Merge changes from topic "freezer v2 frameworks to master" (42310524) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityManager.aidl

+10 −0

Original line number	Diff line number	Diff line
		@@ -695,4 +695,14 @@ interface IActivityManager {
		* android.permission.RESET_APP_ERRORS.
		*/
		void resetAppErrors();

		/**
		* Control the app freezer state. Returns true in case of success, false if the operation
		* didn't succeed (for example, when the app freezer isn't supported).
		* Handling the freezer state via this method is reentrant, that is it can be
		* disabled and re-enabled multiple times in parallel. As long as there's a 1:1 disable to
		* enable match, the freezer is re-enabled at last enable only.
		* @param enable set it to true to enable the app freezer, false to disable it.
		*/
		boolean enableAppFreezer(in boolean enable);
		}

core/java/android/os/BinderProxy.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.os;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.app.AppOpsManager;
		import android.util.Log;
		import android.util.SparseIntArray;
		@@ -255,7 +256,12 @@ public final class BinderProxy implements IBinder {
		// out of system_server to all processes hosting binder objects it holds a reference to;
		// since some of those processes might be frozen, we don't want to block here
		// forever. Disable the freezer.
		Process.enableFreezer(false);
		try {
		ActivityManager.getService().enableAppFreezer(false);
		} catch (RemoteException e) {
		Log.e(Binder.TAG, "RemoteException while disabling app freezer");
		}

		for (WeakReference<BinderProxy> weakRef : proxiesToQuery) {
		BinderProxy bp = weakRef.get();
		String key;
		@@ -278,7 +284,11 @@ public final class BinderProxy implements IBinder {
		counts.put(key, i + 1);
		}
		}
		Process.enableFreezer(true);
		try {
		ActivityManager.getService().enableAppFreezer(true);
		} catch (RemoteException e) {
		Log.e(Binder.TAG, "RemoteException while re-enabling app freezer");
		}
		Map.Entry<String, Integer>[] sorted = counts.entrySet().toArray(
		new Map.Entry[counts.size()]);

core/java/android/os/Process.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -947,7 +947,7 @@ public class Process {

		/**
		* Enable or disable the freezer. When enable == false all frozen processes are unfrozen,
		* but aren't removed from the freezer. Processes can still be added or removed
		* but aren't removed from the freezer. While in this state, processes can be added or removed
		* by using setProcessFrozen, but they won't actually be frozen until the freezer is enabled
		* again. If enable == true the freezer is enabled again, and all processes
		* in the freezer (including the ones added while the freezer was disabled) are frozen.

core/jni/android_util_Process.cpp

+0 −17

Original line number	Diff line number	Diff line
		@@ -372,22 +372,6 @@ void android_os_Process_setProcessFrozen(
		}
		}

		void android_os_Process_enableFreezer(
		JNIEnv *env, jobject clazz, jboolean enable)
		{
		bool success = true;

		if (enable) {
		success = SetTaskProfiles(0, {"FreezerFrozen"}, true);
		} else {
		success = SetTaskProfiles(0, {"FreezerThawed"}, true);
		}

		if (!success) {
		jniThrowException(env, "java/lang/RuntimeException", "Unknown error");
		}
		}

		jint android_os_Process_getProcessGroup(JNIEnv* env, jobject clazz, jint pid)
		{
		SchedPolicy sp;
		@@ -1424,7 +1408,6 @@ static const JNINativeMethod methods[] = {
		{"sendSignal", "(II)V", (void*)android_os_Process_sendSignal},
		{"sendSignalQuiet", "(II)V", (void*)android_os_Process_sendSignalQuiet},
		{"setProcessFrozen", "(IIZ)V", (void*)android_os_Process_setProcessFrozen},
		{"enableFreezer", "(Z)V", (void*)android_os_Process_enableFreezer},
		{"getFreeMemory", "()J", (void*)android_os_Process_getFreeMemory},
		{"getTotalMemory", "()J", (void*)android_os_Process_getTotalMemory},
		{"readProcLines", "(Ljava/lang/String;[Ljava/lang/String;[J)V",

services/core/java/com/android/server/am/ActivityManagerService.java

+22 −26

Original line number	Diff line number	Diff line
		@@ -2103,17 +2103,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		try {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(false);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

		if (!DumpUtils.checkDumpAndUsageStatsPermission(mActivityManagerService.mContext,
		"meminfo", pw)) return;
		PriorityDump.dump(mPriorityDumper, fd, pw, args);
		} finally {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(true);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}
		}
		@@ -2127,17 +2123,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		try {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(false);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

		if (!DumpUtils.checkDumpAndUsageStatsPermission(mActivityManagerService.mContext,
		"gfxinfo", pw)) return;
		mActivityManagerService.dumpGraphicsHardwareUsage(fd, pw, args);
		} finally {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(true);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}
		}
		@@ -2151,17 +2143,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		try {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(false);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

		if (!DumpUtils.checkDumpAndUsageStatsPermission(mActivityManagerService.mContext,
		"dbinfo", pw)) return;
		mActivityManagerService.dumpDbInfo(fd, pw, args);
		} finally {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(true);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}
		}
		@@ -2207,9 +2195,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		try {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(false);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

		if (!DumpUtils.checkDumpAndUsageStatsPermission(mActivityManagerService.mContext,
		"cacheinfo", pw)) {
		@@ -2218,9 +2204,7 @@ public class ActivityManagerService extends IActivityManager.Stub

		mActivityManagerService.dumpBinderCacheContents(fd, pw, args);
		} finally {
		if (mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.useFreezer()) {
		Process.enableFreezer(true);
		}
		mActivityManagerService.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}
		}
		@@ -16834,14 +16818,14 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		Process.enableFreezer(false);
		mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

		final RemoteCallback intermediateCallback = new RemoteCallback(
		new RemoteCallback.OnResultListener() {
		@Override
		public void onResult(Bundle result) {
		finishCallback.sendResult(result);
		Process.enableFreezer(true);
		mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}, null);

		@@ -18771,4 +18755,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		mAppErrors.resetStateLocked();
		}
		}

		@Override
		public boolean enableAppFreezer(boolean enable) {
		int callerUid = Binder.getCallingUid();

		// Only system can toggle the freezer state
		if (callerUid == SYSTEM_UID) {
		return mOomAdjuster.mCachedAppOptimizer.enableFreezer(enable);
		} else {
		throw new SecurityException("Caller uid " + callerUid + " cannot set freezer state ");
		}
		}
		}