[piav2] Code cleanup (e8fb8905) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt

+51 −42

Original line number	Diff line number	Diff line
		@@ -149,11 +149,13 @@ class InstallRepository(private val context: Context) {
		stagedSessionId = intent.getIntExtra(EXTRA_STAGED_SESSION_ID, SessionInfo.INVALID_ID)

		callingPackage = callerInfo.packageName

		// Uid of the source package, coming from ActivityManager
		callingUid = callerInfo.uid
		if (callingUid == Process.INVALID_UID) {
		Log.e(LOG_TAG, "Could not determine the launching uid.")

		val sourceInfo: ApplicationInfo? = getSourceInfo(callingPackage)
		if (callingUid == Process.INVALID_UID && sourceInfo == null) {
		// Caller's identity could not be determined. Abort the install
		Log.e(LOG_TAG, "Cannot determine caller since UID is invalid and sourceInfo is null")
		return InstallAborted(ABORT_REASON_INTERNAL_ERROR)
		}

		originatingUid = callingUid
		@@ -168,25 +170,22 @@ class InstallRepository(private val context: Context) {
		}
		}

		val sourceInfo: ApplicationInfo? = getSourceInfo(callingPackage)
		appOpRequestInfo = AppOpRequestInfo(
		getPackageNameForUid(context, originatingUid, callingPackage),
		originatingUid, callingAttributionTag
		originatingUid,
		callingAttributionTag
		)

		if (localLogv) {
		Log.i(LOG_TAG, "Intent: $intent\n" +
		Log.i(
		LOG_TAG, "Intent: $intent\n" +
		"sessionId: $sessionId\n" +
		"staged sessionId: $stagedSessionId\n" +
		"calling package: $callingPackage\n" +
		"callingUid: $callingUid\n" +
		"originatingUid: $originatingUid")
		}

		if (callingUid == Process.INVALID_UID && sourceInfo == null) {
		// Caller's identity could not be determined. Abort the install
		Log.e(LOG_TAG, "Cannot determine caller since UID is invalid and sourceInfo is null")
		return InstallAborted(ABORT_REASON_INTERNAL_ERROR)
		"originatingUid: $originatingUid\n" +
		"sourceInfo: $sourceInfo"
		)
		}

		if ((sessionId != SessionInfo.INVALID_ID
		@@ -194,9 +193,11 @@ class InstallRepository(private val context: Context) {
		\|\| (stagedSessionId != SessionInfo.INVALID_ID
		&& !isCallerSessionOwner(packageInstaller, Process.myUid(), stagedSessionId))
		) {
		Log.e(LOG_TAG, "UID is not the owner of the session:\n" +
		Log.e(
		LOG_TAG, "UID is not the owner of the session:\n" +
		"CallingUid: $callingUid \| SessionId: $sessionId\n" +
		"My UID: ${Process.myUid()} \| StagedSessionId: $stagedSessionId")
		"My UID: ${Process.myUid()} \| StagedSessionId: $stagedSessionId"
		)
		return InstallAborted(ABORT_REASON_INTERNAL_ERROR)
		}

		@@ -405,7 +406,8 @@ class InstallRepository(private val context: Context) {
		Log.e(LOG_TAG, "Cannot parse package $debugPathName. Assuming defaults.", e)
		params.setSize(pfd.statSize)
		} catch (e: IOException) {
		Log.e(LOG_TAG, "Cannot calculate installed size $debugPathName. " +
		Log.e(
		LOG_TAG, "Cannot calculate installed size $debugPathName. " +
		"Try only apk size.", e
		)
		}
		@@ -771,14 +773,14 @@ class InstallRepository(private val context: Context) {
		}

		private fun handleUnknownSources(requestInfo: AppOpRequestInfo): InstallStage {
		if (requestInfo.callingPackage == null) {
		if (requestInfo.originatingPackage == null) {
		Log.i(LOG_TAG, "No source found for package " + newPackageInfo?.packageName)
		return InstallUserActionRequired(USER_ACTION_REASON_ANONYMOUS_SOURCE)
		}
		// Shouldn't use static constant directly, see b/65534401.
		val appOpStr = AppOpsManager.permissionToOp(Manifest.permission.REQUEST_INSTALL_PACKAGES)
		val appOpMode = appOpsManager!!.noteOpNoThrow(
		appOpStr!!, requestInfo.originatingUid, requestInfo.callingPackage,
		appOpStr!!, requestInfo.originatingUid, requestInfo.originatingPackage,
		requestInfo.attributionTag, "Started package installation activity"
		)
		if (localLogv) {
		@@ -789,20 +791,20 @@ class InstallRepository(private val context: Context) {
		AppOpsManager.MODE_DEFAULT, AppOpsManager.MODE_ERRORED -> {
		if (appOpMode == AppOpsManager.MODE_DEFAULT) {
		appOpsManager.setMode(
		appOpStr, requestInfo.originatingUid, requestInfo.callingPackage,
		appOpStr, requestInfo.originatingUid, requestInfo.originatingPackage,
		AppOpsManager.MODE_ERRORED
		)
		}
		try {
		val sourceInfo =
		packageManager.getApplicationInfo(requestInfo.callingPackage, 0)
		packageManager.getApplicationInfo(requestInfo.originatingPackage, 0)
		val sourceAppSnippet = getAppSnippet(context, sourceInfo)
		InstallUserActionRequired(
		USER_ACTION_REASON_UNKNOWN_SOURCE, appSnippet = sourceAppSnippet,
		dialogMessage = requestInfo.callingPackage
		sourceApp = requestInfo.originatingPackage
		)
		} catch (e: PackageManager.NameNotFoundException) {
		Log.e(LOG_TAG, "Did not find appInfo for " + requestInfo.callingPackage)
		Log.e(LOG_TAG, "Did not find appInfo for " + requestInfo.originatingPackage)
		InstallAborted(ABORT_REASON_INTERNAL_ERROR)
		}
		}
		@@ -844,8 +846,10 @@ class InstallRepository(private val context: Context) {
		setStageBasedOnResult(PackageInstaller.STATUS_SUCCESS, -1, null)
		} catch (e: PackageManager.NameNotFoundException) {
		setStageBasedOnResult(
		PackageInstaller.STATUS_FAILURE, PackageManager.INSTALL_FAILED_INTERNAL_ERROR,
		null)
		PackageInstaller.STATUS_FAILURE,
		PackageManager.INSTALL_FAILED_INTERNAL_ERROR,
		null
		)
		}
		return
		}
		@@ -865,7 +869,8 @@ class InstallRepository(private val context: Context) {
		}
		} catch (e: OutOfIdsException) {
		setStageBasedOnResult(
		PackageInstaller.STATUS_FAILURE, PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null)
		PackageInstaller.STATUS_FAILURE, PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null
		)
		return
		}
		val broadcastIntent = Intent(BROADCAST_ACTION)
		@@ -883,7 +888,8 @@ class InstallRepository(private val context: Context) {
		Log.e(LOG_TAG, "Session $stagedSessionId could not be opened.", e)
		packageInstaller.abandonSession(stagedSessionId)
		setStageBasedOnResult(
		PackageInstaller.STATUS_FAILURE, PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null)
		PackageInstaller.STATUS_FAILURE, PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null
		)
		}
		}

		@@ -893,9 +899,11 @@ class InstallRepository(private val context: Context) {
		message: String?,
		) {
		if (localLogv) {
		Log.i(LOG_TAG, "Status code: $statusCode\n" +
		Log.i(
		LOG_TAG, "Status code: $statusCode\n" +
		"legacy status: $legacyStatus\n" +
		"message: $message")
		"message: $message"
		)
		}
		if (statusCode == PackageInstaller.STATUS_SUCCESS) {
		val shouldReturnResult = intent.getBooleanExtra(Intent.EXTRA_RETURN_RESULT, false)
		@@ -908,11 +916,12 @@ class InstallRepository(private val context: Context) {
		_installResult.setValue(InstallSuccess(appSnippet, shouldReturnResult, resultIntent))
		} else {
		if (statusCode != PackageInstaller.STATUS_FAILURE_ABORTED) {
		_installResult.setValue(InstallFailed(appSnippet, statusCode, legacyStatus, message))
		_installResult.setValue(
		InstallFailed(appSnippet, statusCode, legacyStatus, message)
		)
		} else {
		_installResult.setValue(InstallAborted(ABORT_REASON_INTERNAL_ERROR))
		}

		}
		}

		@@ -956,7 +965,7 @@ class InstallRepository(private val context: Context) {

		data class CallerInfo(val packageName: String?, val uid: Int)
		data class AppOpRequestInfo(
		val callingPackage: String?,
		val originatingPackage: String?,
		val originatingUid: Int,
		val attributionTag: String?,
		)

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallStages.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,10 @@ data class InstallUserActionRequired(
		val actionReason: Int,
		private val appSnippet: PackageUtil.AppSnippet? = null,
		val isAppUpdating: Boolean = false,
		val dialogMessage: String? = null,
		/**
		* This holds either a package name or the app label of the install source.
		*/
		val sourceApp: String? = null,
		) : InstallStage(STAGE_USER_ACTION_REQUIRED) {

		val appIcon: Drawable?

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt

+9 −8

Original line number	Diff line number	Diff line
		@@ -362,8 +362,8 @@ object PackageUtil {
		* @return the packageName corresponding to a UID.
		*/
		@JvmStatic
		fun getPackageNameForUid(context: Context, sourceUid: Int, callingPackage: String?): String? {
		if (sourceUid == Process.INVALID_UID) {
		fun getPackageNameForUid(context: Context, uid: Int, preferredPkgName: String?): String? {
		if (uid == Process.INVALID_UID) {
		return null
		}
		// If the sourceUid belongs to the system downloads provider, we explicitly return the
		@@ -371,20 +371,21 @@ object PackageUtil {
		// packages, resulting in uncertainty about which package will end up first in the list
		// of packages associated with this UID
		val pm = context.packageManager
		val systemDownloadProviderInfo = getSystemDownloadsProviderInfo(pm, sourceUid)
		val systemDownloadProviderInfo = getSystemDownloadsProviderInfo(pm, uid)
		if (systemDownloadProviderInfo != null) {
		return systemDownloadProviderInfo.packageName
		}
		val packagesForUid = pm.getPackagesForUid(sourceUid) ?: return null

		val packagesForUid = pm.getPackagesForUid(uid) ?: return null
		if (packagesForUid.size > 1) {
		if (callingPackage != null) {
		Log.i(LOG_TAG, "Multiple packages found for source uid $uid")
		if (preferredPkgName != null) {
		for (packageName in packagesForUid) {
		if (packageName == callingPackage) {
		if (packageName == preferredPkgName) {
		return packageName
		}
		}
		}
		Log.i(LOG_TAG, "Multiple packages found for source uid $sourceUid")
		}
		return packagesForUid[0]
		}
		@@ -439,7 +440,7 @@ object PackageUtil {
		*/
		data class AppSnippet(var label: CharSequence?, var icon: Drawable?) {
		override fun toString(): String {
		return "AppSnippet[label = ${label}, hasIcon = ${icon != null}]"
		return "AppSnippet[label = $label, hasIcon = ${icon != null}]"
		}
		}
		}

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/ExternalSourcesBlockedFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class ExternalSourcesBlockedFragment extends DialogFragment {
		.setMessage(R.string.untrusted_external_source_warning)
		.setPositiveButton(R.string.external_sources_settings,
		(dialog, which) -> mInstallActionListener.sendUnknownAppsIntent(
		mDialogData.getDialogMessage()))
		mDialogData.getSourceApp()))
		.setNegativeButton(R.string.cancel,
		(dialog, which) -> mInstallActionListener.onNegativeResponse(
		mDialogData.getStageCode()))

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class InstallConfirmationFragment extends DialogFragment {

		int positiveBtnTextRes;
		if (mDialogData.isAppUpdating()) {
		if (mDialogData.getDialogMessage() != null) {
		if (mDialogData.getSourceApp() != null) {
		positiveBtnTextRes = R.string.update_anyway;
		} else {
		positiveBtnTextRes = R.string.update;
		@@ -88,9 +88,10 @@ public class InstallConfirmationFragment extends DialogFragment {
		TextView viewToEnable;
		if (mDialogData.isAppUpdating()) {
		viewToEnable = dialogView.requireViewById(R.id.install_confirm_question_update);
		String dialogMessage = mDialogData.getDialogMessage();
		if (dialogMessage != null) {
		viewToEnable.setText(Html.fromHtml(dialogMessage, Html.FROM_HTML_MODE_LEGACY));
		String sourcePackageName = mDialogData.getSourceApp();
		if (sourcePackageName != null) {
		// Show the update-ownership change message
		viewToEnable.setText(Html.fromHtml(sourcePackageName, Html.FROM_HTML_MODE_LEGACY));
		}
		} else {
		viewToEnable = dialogView.requireViewById(R.id.install_confirm_question);