Snap for 8666349 from 71d6201b81cab7d485e7bd0fc882d665500b5549 to tm-qpr1-release (22451c5e) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −12

Original line number	Diff line number	Diff line
		@@ -1897,12 +1897,6 @@
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/TaskFragment.java"
		},
		"-240296576": {
		"message": "handleAppTransitionReady: displayId=%d appTransition={%s} openingApps=[%s] closingApps=[%s] transit=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/AppTransitionController.java"
		},
		"-237664290": {
		"message": "Pause the recording session on display %s",
		"level": "VERBOSE",
		@@ -2005,6 +1999,12 @@
		"group": "WM_DEBUG_CONTENT_RECORDING",
		"at": "com\/android\/server\/wm\/ContentRecorder.java"
		},
		"-134793542": {
		"message": "handleAppTransitionReady: displayId=%d appTransition={%s} excludeLauncherFromAnimation=%b openingApps=[%s] closingApps=[%s] transit=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/AppTransitionController.java"
		},
		"-134091882": {
		"message": "Screenshotting Activity %s",
		"level": "VERBOSE",
		@@ -2521,12 +2521,6 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"323235828": {
		"message": "Delaying app transition for recents animation to finish",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/AppTransitionController.java"
		},
		"327461496": {
		"message": "Complete pause: %s",
		"level": "VERBOSE",

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -908,6 +908,8 @@ public class BubbleExpandedView extends LinearLayout {
		* @param animate whether the pointer should animate to this position.
		*/
		public void setPointerPosition(float bubblePosition, boolean onLeft, boolean animate) {
		final boolean isRtl = mContext.getResources().getConfiguration().getLayoutDirection()
		== LAYOUT_DIRECTION_RTL;
		// Pointer gets drawn in the padding
		final boolean showVertically = mPositioner.showBubblesVertically();
		final float paddingLeft = (showVertically && onLeft)
		@@ -932,12 +934,23 @@ public class BubbleExpandedView extends LinearLayout {
		updatePointerView();
		if (showVertically) {
		mPointerPos.y = bubbleCenter - (mPointerWidth / 2f);
		if (!isRtl) {
		mPointerPos.x = onLeft
		? -mPointerHeight + mPointerOverlap
		: getWidth() - mPaddingRight - mPointerOverlap;
		} else {
		mPointerPos.x = onLeft
		? -(getWidth() - mPaddingLeft - mPointerOverlap)
		: mPointerHeight - mPointerOverlap;
		}
		} else {
		mPointerPos.y = mPointerOverlap;
		if (!isRtl) {
		mPointerPos.x = bubbleCenter - (mPointerWidth / 2f);
		} else {
		mPointerPos.x = -(getWidth() - mPaddingLeft - bubbleCenter)
		+ (mPointerWidth / 2f);
		}
		}
		if (animate) {
		mPointerView.animate().translationX(mPointerPos.x).translationY(

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1604,6 +1604,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		// Avoid double removal, which is fatal.
		return;
		}
		if (surface == null \|\| !surface.isValid()) {
		ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
		"%s: trying to remove invalid content overlay (%s)", TAG, surface);
		return;
		}
		final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();
		tx.remove(surface);
		tx.apply();

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

+39 −6

Original line number	Diff line number	Diff line
		@@ -128,6 +128,10 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
		import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.am.MemoryStatUtil.hasMemcg;
		import static com.android.server.am.ProcessList.ProcStartHandler;
		import static com.android.server.am.ProcessProfileRecord.HOSTING_COMPONENT_TYPE_BACKUP;
		import static com.android.server.am.ProcessProfileRecord.HOSTING_COMPONENT_TYPE_INSTRUMENTATION;
		import static com.android.server.am.ProcessProfileRecord.HOSTING_COMPONENT_TYPE_PERSISTENT;
		import static com.android.server.am.ProcessProfileRecord.HOSTING_COMPONENT_TYPE_SYSTEM;
		import static com.android.server.net.NetworkPolicyManagerInternal.updateBlockedReasonsWithProcState;
		import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP;
		@@ -1877,6 +1881,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		app.setPid(MY_PID);
		app.mState.setMaxAdj(ProcessList.SYSTEM_ADJ);
		app.makeActive(mSystemThread.getApplicationThread(), mProcessStats);
		app.mProfile.addHostingComponentType(HOSTING_COMPONENT_TYPE_SYSTEM);
		addPidLocked(app);
		updateLruProcessLocked(app, false, null);
		updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
		@@ -4169,7 +4174,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		mi.getTotalRss(),
		ProcessStats.ADD_PSS_EXTERNAL_SLOW,
		duration,
		holder.appVersion);
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		}
		}
		@@ -4227,7 +4234,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		tmpUss[2],
		ProcessStats.ADD_PSS_EXTERNAL,
		duration,
		holder.appVersion);
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		}
		}
		@@ -6406,8 +6415,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		.getPersistentApplications(STOCK_PM_FLAGS \| matchFlags).getList();
		for (ApplicationInfo app : apps) {
		if (!"android".equals(app.packageName)) {
		addAppLocked(app, null, false, null /* ABI override */,
		final ProcessRecord proc = addAppLocked(
		app, null, false, null /* ABI override */,
		ZYGOTE_POLICY_FLAG_BATCH_LAUNCH);
		if (proc != null) {
		proc.mProfile.addHostingComponentType(
		HOSTING_COMPONENT_TYPE_PERSISTENT);
		}
		}
		}
		} catch (RemoteException ex) {
		@@ -11285,7 +11299,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		holder.state.getPackage(),
		myTotalPss, myTotalUss, myTotalRss, reportType,
		endTime-startTime,
		holder.appVersion);
		holder.appVersion,
		r.mProfile.getCurrentHostingComponentTypes(),
		r.mProfile.getHistoricalHostingComponentTypes());
		});
		}
		}
		@@ -11928,7 +11944,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		holder.state.getName(),
		holder.state.getPackage(),
		myTotalPss, myTotalUss, myTotalRss, reportType, endTime-startTime,
		holder.appVersion);
		holder.appVersion,
		r.mProfile.getCurrentHostingComponentTypes(),
		r.mProfile.getHistoricalHostingComponentTypes());
		});
		}
		}
		@@ -12762,6 +12780,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		newBackupUid = proc.isInFullBackup() ? r.appInfo.uid : -1;
		mBackupTargets.put(targetUserId, r);

		proc.mProfile.addHostingComponentType(HOSTING_COMPONENT_TYPE_BACKUP);

		// Try not to kill the process during backup
		updateOomAdjLocked(proc, OomAdjuster.OOM_ADJ_REASON_NONE);

		@@ -12804,7 +12824,15 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		synchronized (this) {
		mBackupTargets.delete(userId);
		final int indexOfKey = mBackupTargets.indexOfKey(userId);
		if (indexOfKey >= 0) {
		final BackupRecord backupTarget = mBackupTargets.valueAt(indexOfKey);
		if (backupTarget != null && backupTarget.app != null) {
		backupTarget.app.mProfile.clearHostingComponentType(
		HOSTING_COMPONENT_TYPE_BACKUP);
		}
		mBackupTargets.removeAt(indexOfKey);
		}
		}

		JobSchedulerInternal js = LocalServices.getService(JobSchedulerInternal.class);
		@@ -12882,6 +12910,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		final ProcessRecord proc = backupTarget.app;
		updateOomAdjLocked(proc, OomAdjuster.OOM_ADJ_REASON_NONE);
		proc.setInFullBackup(false);
		proc.mProfile.clearHostingComponentType(HOSTING_COMPONENT_TYPE_BACKUP);

		oldBackupUid = backupTarget != null ? backupTarget.appInfo.uid : -1;

		@@ -14610,6 +14639,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks,
		disableTestApiChecks, abiOverride, ZYGOTE_POLICY_FLAG_EMPTY);
		app.mProfile.addHostingComponentType(HOSTING_COMPONENT_TYPE_INSTRUMENTATION);
		}

		app.setActiveInstrumentation(activeInstr);
		@@ -14734,6 +14764,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (!mActiveInstrumentation.contains(activeInstr)) {
		mActiveInstrumentation.add(activeInstr);
		}
		app.mProfile.addHostingComponentType(HOSTING_COMPONENT_TYPE_INSTRUMENTATION);
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		@@ -14863,6 +14894,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		instr.removeProcess(app);
		app.setActiveInstrumentation(null);
		}
		app.mProfile.clearHostingComponentType(HOSTING_COMPONENT_TYPE_INSTRUMENTATION);

		if (app.isSdkSandbox) {
		// For sharedUid apps this will kill all sdk sandbox processes, which is not ideal.
		@@ -15743,6 +15775,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (app.isPersistent()) {
		addAppLocked(app.info, null, false, null /* ABI override */,
		ZYGOTE_POLICY_FLAG_BATCH_LAUNCH);
		app.mProfile.addHostingComponentType(HOSTING_COMPONENT_TYPE_PERSISTENT);
		}
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -573,7 +573,9 @@ public class AppProfiler {
		holder.state.getPackage(),
		pss, uss, rss,
		statType, pssDuration,
		holder.appVersion);
		holder.appVersion,
		profile.getCurrentHostingComponentTypes(),
		profile.getHistoricalHostingComponentTypes());
		});
		if (DEBUG_PSS) {
		Slog.d(TAG_PSS,