Merge "[ADI][metrics] add booleans for user action received" into main (435f3e70) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageInstallerSession.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -5022,6 +5022,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		throw new SecurityException("Must be sealed to accept permissions");
		}

		synchronized (mMetrics) {
		mMetrics.onUserResponseReceived();
		}

		// To support pre-approval request of atomic install, we allow child session to handle
		// the result by itself since it has the status receiver.
		final PackageInstallerSession root = hasParentSessionId() && isCommitted()

services/core/java/com/android/server/pm/SessionMetrics.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ final class SessionMetrics {
		private final boolean mIsAutoInstallDependenciesEnabled;
		private long mApksSizeBytes;
		private boolean mWasUserActionIntentSent;
		private boolean mWasUserResponseReceived;
		private final int mDefaultDeveloperVerificationPolicy;
		private long mDeveloperVerifierBindStartedMillis;
		private long mDeveloperVerifierConnectedMillis;
		@@ -102,6 +103,7 @@ final class SessionMetrics {
		private @DeveloperVerificationStatus.DeveloperVerifierStatusAsl int mAslStatus;
		private @PackageInstaller.DeveloperVerificationPolicy int mDeveloperVerificationPolicyOverride;
		private boolean mWasDeveloperVerificationUserActionRequired = false;
		private boolean mWasDeveloperVerificationUserResponseReceived = false;
		private @PackageInstaller.DeveloperVerificationUserConfirmationInfo.UserActionNeededReason int
		mDeveloperVerificationUserActionRequiredReason;
		private @PackageInstaller.DeveloperVerificationUserResponse int
		@@ -162,6 +164,10 @@ final class SessionMetrics {
		mWasUserActionIntentSent = true;
		}

		public void onUserResponseReceived() {
		mWasUserResponseReceived = true;
		}

		public void onSessionCommitted(long committedMillis) {
		mCommittedMillis = committedMillis;
		}
		@@ -264,6 +270,7 @@ final class SessionMetrics {
		public void onDeveloperVerificationUserResponseReceived(
		@PackageInstaller.DeveloperVerificationUserResponse int response) {
		mDeveloperVerificationUserResponse = response;
		mWasDeveloperVerificationUserResponseReceived = true;
		}

		public void onDeveloperVerificationLiteEnabled() {
		@@ -354,7 +361,9 @@ final class SessionMetrics {
		mDeveloperVerificationDurationMillis,
		developerVerificationPrepDurationMillis,
		mDeveloperVerificationRetryDurationMillis,
		developerVerifierConnectionDurationMillis
		developerVerifierConnectionDurationMillis,
		mWasUserResponseReceived,
		mWasDeveloperVerificationUserResponseReceived
		)
		);
		}