Delete redundant utils classes from Pia v2 (f476db90) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/AndroidManifest.xml

+0 −26

Original line number	Diff line number	Diff line
		@@ -43,14 +43,6 @@
		</intent-filter>
		</receiver>

		<receiver android:name="v2.model.TemporaryFileManager"
		android:exported="false"
		android:enabled="false">
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		</receiver>

		<activity android:name=".v2.ui.InstallLaunch"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:theme="@style/Theme.AlertDialogActivity"
		@@ -109,15 +101,6 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".v2.model.InstallEventReceiver"
		android:permission="android.permission.INSTALL_PACKAGES"
		android:exported="false"
		android:enabled="false">
		<intent-filter android:priority="1">
		<action android:name="com.android.packageinstaller.ACTION_INSTALL_COMMIT" />
		</intent-filter>
		</receiver>

		<activity android:name=".InstallSuccess"
		android:theme="@style/Theme.AlertDialogActivity.NoAnimation"
		android:exported="false" />
		@@ -156,15 +139,6 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".v2.model.UninstallEventReceiver"
		android:permission="android.permission.INSTALL_PACKAGES"
		android:exported="false"
		android:enabled="false">
		<intent-filter android:priority="1">
		<action android:name="com.android.packageinstaller.ACTION_UNINSTALL_COMMIT" />
		</intent-filter>
		</receiver>

		<receiver android:name=".PackageInstalledReceiver"
		android:exported="false">
		<intent-filter android:priority="1">

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/EventResultPersister.java

deleted100644 → 0

+0 −378

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.packageinstaller.v2.model;

		import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageInstaller;
		import android.os.AsyncTask;
		import android.util.AtomicFile;
		import android.util.Log;
		import android.util.SparseArray;
		import android.util.Xml;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.nio.charset.StandardCharsets;
		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;
		import org.xmlpull.v1.XmlSerializer;

		/**
		* Persists results of events and calls back observers when a matching result arrives.
		*/
		public class EventResultPersister {

		/**
		* Id passed to {@link #addObserver(int, EventResultObserver)} to generate new id
		*/
		public static final int GENERATE_NEW_ID = Integer.MIN_VALUE;
		/**
		* The extra with the id to set in the intent delivered to
		* {@link #onEventReceived(Context, Intent)}
		*/
		public static final String EXTRA_ID = "EventResultPersister.EXTRA_ID";
		public static final String EXTRA_SERVICE_ID = "EventResultPersister.EXTRA_SERVICE_ID";
		private static final String TAG = EventResultPersister.class.getSimpleName();
		/**
		* Persisted state of this object
		*/
		private final AtomicFile mResultsFile;

		private final Object mLock = new Object();

		/**
		* Currently stored but not yet called back results (install id -> status, status message)
		*/
		private final SparseArray<EventResult> mResults = new SparseArray<>();

		/**
		* Currently registered, not called back observers (install id -> observer)
		*/
		private final SparseArray<EventResultObserver> mObservers = new SparseArray<>();

		/**
		* Always increasing counter for install event ids
		*/
		private int mCounter;

		/**
		* If a write that will persist the state is scheduled
		*/
		private boolean mIsPersistScheduled;

		/**
		* If the state was changed while the data was being persisted
		*/
		private boolean mIsPersistingStateValid;

		/**
		* Read persisted state.
		*
		* @param resultFile The file the results are persisted in
		*/
		EventResultPersister(@NonNull File resultFile) {
		mResultsFile = new AtomicFile(resultFile);
		mCounter = GENERATE_NEW_ID + 1;

		try (FileInputStream stream = mResultsFile.openRead()) {
		XmlPullParser parser = Xml.newPullParser();
		parser.setInput(stream, StandardCharsets.UTF_8.name());

		nextElement(parser);
		while (parser.getEventType() != XmlPullParser.END_DOCUMENT) {
		String tagName = parser.getName();
		if ("results".equals(tagName)) {
		mCounter = readIntAttribute(parser, "counter");
		} else if ("result".equals(tagName)) {
		int id = readIntAttribute(parser, "id");
		int status = readIntAttribute(parser, "status");
		int legacyStatus = readIntAttribute(parser, "legacyStatus");
		String statusMessage = readStringAttribute(parser, "statusMessage");
		int serviceId = readIntAttribute(parser, "serviceId");

		if (mResults.get(id) != null) {
		throw new Exception("id " + id + " has two results");
		}

		mResults.put(id, new EventResult(status, legacyStatus, statusMessage,
		serviceId));
		} else {
		throw new Exception("unexpected tag");
		}

		nextElement(parser);
		}
		} catch (Exception e) {
		mResults.clear();
		writeState();
		}
		}

		/**
		* Progress parser to the next element.
		*
		* @param parser The parser to progress
		*/
		private static void nextElement(@NonNull XmlPullParser parser)
		throws XmlPullParserException, IOException {
		int type;
		do {
		type = parser.next();
		} while (type != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT);
		}

		/**
		* Read an int attribute from the current element
		*
		* @param parser The parser to read from
		* @param name The attribute name to read
		* @return The value of the attribute
		*/
		private static int readIntAttribute(@NonNull XmlPullParser parser, @NonNull String name) {
		return Integer.parseInt(parser.getAttributeValue(null, name));
		}

		/**
		* Read an String attribute from the current element
		*
		* @param parser The parser to read from
		* @param name The attribute name to read
		* @return The value of the attribute or null if the attribute is not set
		*/
		private static String readStringAttribute(@NonNull XmlPullParser parser, @NonNull String name) {
		return parser.getAttributeValue(null, name);
		}

		/**
		* @return a new event id.
		*/
		public int getNewId() throws OutOfIdsException {
		synchronized (mLock) {
		if (mCounter == Integer.MAX_VALUE) {
		throw new OutOfIdsException();
		}

		mCounter++;
		writeState();

		return mCounter - 1;
		}
		}

		/**
		* Add a result. If the result is a pending user action, execute the pending user action
		* directly and do not queue a result.
		*
		* @param context The context the event was received in
		* @param intent The intent the activity received
		*/
		void onEventReceived(@NonNull Context context, @NonNull Intent intent) {
		int status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0);

		if (status == PackageInstaller.STATUS_PENDING_USER_ACTION) {
		Intent intentToStart = intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent.class);
		intentToStart.addFlags(FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intentToStart);

		return;
		}

		int id = intent.getIntExtra(EXTRA_ID, 0);
		String statusMessage = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
		int legacyStatus = intent.getIntExtra(PackageInstaller.EXTRA_LEGACY_STATUS, 0);
		int serviceId = intent.getIntExtra(EXTRA_SERVICE_ID, 0);

		EventResultObserver observerToCall = null;
		synchronized (mLock) {
		int numObservers = mObservers.size();
		for (int i = 0; i < numObservers; i++) {
		if (mObservers.keyAt(i) == id) {
		observerToCall = mObservers.valueAt(i);
		mObservers.removeAt(i);

		break;
		}
		}

		if (observerToCall != null) {
		observerToCall.onResult(status, legacyStatus, statusMessage, serviceId);
		} else {
		mResults.put(id, new EventResult(status, legacyStatus, statusMessage, serviceId));
		writeState();
		}
		}
		}

		/**
		* Persist current state. The persistence might be delayed.
		*/
		private void writeState() {
		synchronized (mLock) {
		mIsPersistingStateValid = false;

		if (!mIsPersistScheduled) {
		mIsPersistScheduled = true;

		AsyncTask.execute(() -> {
		int counter;
		SparseArray<EventResult> results;

		while (true) {
		// Take snapshot of state
		synchronized (mLock) {
		counter = mCounter;
		results = mResults.clone();
		mIsPersistingStateValid = true;
		}

		try (FileOutputStream stream = mResultsFile.startWrite()) {
		try {
		XmlSerializer serializer = Xml.newSerializer();
		serializer.setOutput(stream, StandardCharsets.UTF_8.name());
		serializer.startDocument(null, true);
		serializer.setFeature(
		"http://xmlpull.org/v1/doc/features.html#indent-output", true);
		serializer.startTag(null, "results");
		serializer.attribute(null, "counter", Integer.toString(counter));

		int numResults = results.size();
		for (int i = 0; i < numResults; i++) {
		serializer.startTag(null, "result");
		serializer.attribute(null, "id",
		Integer.toString(results.keyAt(i)));
		serializer.attribute(null, "status",
		Integer.toString(results.valueAt(i).status));
		serializer.attribute(null, "legacyStatus",
		Integer.toString(results.valueAt(i).legacyStatus));
		if (results.valueAt(i).message != null) {
		serializer.attribute(null, "statusMessage",
		results.valueAt(i).message);
		}
		serializer.attribute(null, "serviceId",
		Integer.toString(results.valueAt(i).serviceId));
		serializer.endTag(null, "result");
		}

		serializer.endTag(null, "results");
		serializer.endDocument();

		mResultsFile.finishWrite(stream);
		} catch (IOException e) {
		Log.e(TAG, "error writing results", e);
		mResultsFile.failWrite(stream);
		mResultsFile.delete();
		}
		} catch (IOException e) {
		Log.e(TAG, "error writing results", e);
		mResultsFile.delete();
		}

		// Check if there was changed state since we persisted. If so, we need to
		// persist again.
		synchronized (mLock) {
		if (mIsPersistingStateValid) {
		mIsPersistScheduled = false;
		break;
		}
		}
		}
		});
		}
		}
		}

		/**
		* Add an observer. If there is already an event for this id, call back inside of this call.
		*
		* @param id The id the observer is for or {@code GENERATE_NEW_ID} to generate a new one.
		* @param observer The observer to call back.
		* @return The id for this event
		*/
		int addObserver(int id, @NonNull EventResultObserver observer)
		throws OutOfIdsException {
		synchronized (mLock) {
		int resultIndex = -1;

		if (id == GENERATE_NEW_ID) {
		id = getNewId();
		} else {
		resultIndex = mResults.indexOfKey(id);
		}

		// Check if we can instantly call back
		if (resultIndex >= 0) {
		EventResult result = mResults.valueAt(resultIndex);

		observer.onResult(result.status, result.legacyStatus, result.message,
		result.serviceId);
		mResults.removeAt(resultIndex);
		writeState();
		} else {
		mObservers.put(id, observer);
		}
		}

		return id;
		}

		/**
		* Remove a observer.
		*
		* @param id The id the observer was added for
		*/
		void removeObserver(int id) {
		synchronized (mLock) {
		mObservers.delete(id);
		}
		}

		/**
		* Call back when a result is received. Observer is removed when onResult it called.
		*/
		public interface EventResultObserver {

		void onResult(int status, int legacyStatus, @Nullable String message, int serviceId);
		}

		/**
		* The status from an event.
		*/
		private static class EventResult {

		public final int status;
		public final int legacyStatus;
		@Nullable
		public final String message;
		public final int serviceId;

		private EventResult(int status, int legacyStatus, @Nullable String message, int serviceId) {
		this.status = status;
		this.legacyStatus = legacyStatus;
		this.message = message;
		this.serviceId = serviceId;
		}
		}

		public static class OutOfIdsException extends Exception {
		}
		}

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallEventReceiver.java

deleted100644 → 0

+0 −77

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.packageinstaller.v2.model;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import androidx.annotation.NonNull;

		/**
		* Receives install events and perists them using a {@link EventResultPersister}.
		*/
		public class InstallEventReceiver extends BroadcastReceiver {

		private static final Object sLock = new Object();
		private static EventResultPersister sReceiver;

		/**
		* Get the event receiver persisting the results
		*
		* @return The event receiver.
		*/
		@NonNull
		private static EventResultPersister getReceiver(@NonNull Context context) {
		synchronized (sLock) {
		if (sReceiver == null) {
		sReceiver = new EventResultPersister(
		TemporaryFileManager.getInstallStateFile(context));
		}
		}

		return sReceiver;
		}

		/**
		* Add an observer. If there is already an event for this id, call back inside of this call.
		*
		* @param context A context of the current app
		* @param id The id the observer is for or {@code GENERATE_NEW_ID} to generate a new one.
		* @param observer The observer to call back.
		* @return The id for this event
		*/
		static int addObserver(@NonNull Context context, int id,
		@NonNull EventResultPersister.EventResultObserver observer)
		throws EventResultPersister.OutOfIdsException {
		return getReceiver(context).addObserver(id, observer);
		}

		/**
		* Remove a observer.
		*
		* @param context A context of the current app
		* @param id The id the observer was added for
		*/
		static void removeObserver(@NonNull Context context, int id) {
		getReceiver(context).removeObserver(id);
		}

		@Override
		public void onReceive(Context context, Intent intent) {
		getReceiver(context).onEventReceived(context, intent);
		}
		}

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/TemporaryFileManager.java

deleted100644 → 0

+0 −92

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.packageinstaller.v2.model;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.os.SystemClock;
		import android.util.Log;
		import androidx.annotation.NonNull;
		import java.io.File;
		import java.io.IOException;

		/**
		* Manages files of the package installer and resets state during boot.
		*/
		public class TemporaryFileManager extends BroadcastReceiver {

		private static final String LOG_TAG = TemporaryFileManager.class.getSimpleName();

		/**
		* Create a new file to hold a staged file.
		*
		* @param context The context of the caller
		* @return A new file
		*/
		@NonNull
		public static File getStagedFile(@NonNull Context context) throws IOException {
		return File.createTempFile("package", ".apk", context.getNoBackupFilesDir());
		}

		/**
		* Get the file used to store the results of installs.
		*
		* @param context The context of the caller
		* @return the file used to store the results of installs
		*/
		@NonNull
		public static File getInstallStateFile(@NonNull Context context) {
		return new File(context.getNoBackupFilesDir(), "install_results.xml");
		}

		/**
		* Get the file used to store the results of uninstalls.
		*
		* @param context The context of the caller
		* @return the file used to store the results of uninstalls
		*/
		@NonNull
		public static File getUninstallStateFile(@NonNull Context context) {
		return new File(context.getNoBackupFilesDir(), "uninstall_results.xml");
		}

		@Override
		public void onReceive(Context context, Intent intent) {
		long systemBootTime = System.currentTimeMillis() - SystemClock.elapsedRealtime();

		File[] filesOnBoot = context.getNoBackupFilesDir().listFiles();

		if (filesOnBoot == null) {
		return;
		}

		for (int i = 0; i < filesOnBoot.length; i++) {
		File fileOnBoot = filesOnBoot[i];

		if (systemBootTime > fileOnBoot.lastModified()) {
		boolean wasDeleted = fileOnBoot.delete();
		if (!wasDeleted) {
		Log.w(LOG_TAG, "Could not delete " + fileOnBoot.getName() + " onBoot");
		}
		} else {
		Log.w(LOG_TAG, fileOnBoot.getName() + " was created before onBoot broadcast was "
		+ "received");
		}
		}
		}
		}

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallEventReceiver.java

deleted100644 → 0

+0 −85

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* https://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.packageinstaller.v2.model;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import androidx.annotation.NonNull;

		/**
		* Receives uninstall events and persists them using a {@link EventResultPersister}.
		*/
		public class UninstallEventReceiver extends BroadcastReceiver {
		private static final Object sLock = new Object();
		private static EventResultPersister sReceiver;

		/**
		* Get the event receiver persisting the results
		*
		* @return The event receiver.
		*/
		@NonNull private static EventResultPersister getReceiver(@NonNull Context context) {
		synchronized (sLock) {
		if (sReceiver == null) {
		sReceiver = new EventResultPersister(
		TemporaryFileManager.getUninstallStateFile(context));
		}
		}

		return sReceiver;
		}

		@Override
		public void onReceive(Context context, Intent intent) {
		getReceiver(context).onEventReceived(context, intent);
		}

		/**
		* Add an observer. If there is already an event for this id, call back inside of this call.
		*
		* @param context A context of the current app
		* @param id The id the observer is for or {@code GENERATE_NEW_ID} to generate a new one.
		* @param observer The observer to call back.
		*
		* @return The id for this event
		*/
		public static int addObserver(@NonNull Context context, int id,
		@NonNull EventResultPersister.EventResultObserver observer)
		throws EventResultPersister.OutOfIdsException {
		return getReceiver(context).addObserver(id, observer);
		}

		/**
		* Remove a observer.
		*
		* @param context A context of the current app
		* @param id The id the observer was added for
		*/
		static void removeObserver(@NonNull Context context, int id) {
		getReceiver(context).removeObserver(id);
		}

		/**
		* @param context A context of the current app
		*
		* @return A new uninstall id
		*/
		static int getNewId(@NonNull Context context) throws EventResultPersister.OutOfIdsException {
		return getReceiver(context).getNewId();
		}
		}