Merge "Recover from missing upgrade to system package." into lmp-dev (4c880877) · Commits · e / os / android_frameworks_base

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

+64 −1

Original line number	Diff line number	Diff line
		@@ -175,11 +175,13 @@ import android.view.Display;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		import java.io.BufferedReader;
		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.FileOutputStream;
		import java.io.FileReader;
		import java.io.FilenameFilter;
		import java.io.IOException;
		import java.io.InputStream;
		@@ -1553,6 +1555,7 @@ public class PackageManagerService extends IPackageManager.Stub {

		// Prune any system packages that no longer exist.
		final List<String> possiblyDeletedUpdatedSystemApps = new ArrayList<String>();
		final ArrayMap<String, File> expectingBetter = new ArrayMap<>();
		if (!mOnlyCore) {
		Iterator<PackageSetting> psit = mSettings.mPackages.values().iterator();
		while (psit.hasNext()) {
		@@ -1585,6 +1588,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		+ ", versionCode=" + ps.versionCode + "; scanned versionCode="
		+ scannedPkg.mVersionCode);
		removePackageLI(ps, true);
		expectingBetter.put(ps.name, ps.codePath);
		}

		continue;
		@@ -1652,6 +1656,49 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		logCriticalInfo(Log.WARN, msg);
		}

		/**
		* Make sure all system apps that we expected to appear on
		* the userdata partition actually showed up. If they never
		* appeared, crawl back and revive the system version.
		*/
		for (int i = 0; i < expectingBetter.size(); i++) {
		final String packageName = expectingBetter.keyAt(i);
		if (!mPackages.containsKey(packageName)) {
		final File scanFile = expectingBetter.valueAt(i);

		logCriticalInfo(Log.WARN, "Expected better " + packageName
		+ " but never showed up; reverting to system");

		final int reparseFlags;
		if (FileUtils.contains(privilegedAppDir, scanFile)) {
		reparseFlags = PackageParser.PARSE_IS_SYSTEM
		\| PackageParser.PARSE_IS_SYSTEM_DIR
		\| PackageParser.PARSE_IS_PRIVILEGED;
		} else if (FileUtils.contains(systemAppDir, scanFile)) {
		reparseFlags = PackageParser.PARSE_IS_SYSTEM
		\| PackageParser.PARSE_IS_SYSTEM_DIR;
		} else if (FileUtils.contains(vendorAppDir, scanFile)) {
		reparseFlags = PackageParser.PARSE_IS_SYSTEM
		\| PackageParser.PARSE_IS_SYSTEM_DIR;
		} else if (FileUtils.contains(oemAppDir, scanFile)) {
		reparseFlags = PackageParser.PARSE_IS_SYSTEM
		\| PackageParser.PARSE_IS_SYSTEM_DIR;
		} else {
		Slog.e(TAG, "Ignoring unexpected fallback path " + scanFile);
		continue;
		}

		mSettings.enableSystemPackageLPw(packageName);

		try {
		scanPackageLI(scanFile, reparseFlags, scanFlags, 0, null);
		} catch (PackageManagerException e) {
		Slog.e(TAG, "Failed to parse original system package: "
		+ e.getMessage());
		}
		}
		}
		}

		// Now that we know all of the shared libraries, update all clients to have
		@@ -12104,6 +12151,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		break;
		}
		opti++;

		if ("-a".equals(opt)) {
		// Right now we only know how to print all.
		} else if ("-h".equals(opt)) {
		@@ -12450,6 +12498,21 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}
		}

		if (checkin && dumpState.isDumping(DumpState.DUMP_MESSAGES)) {
		BufferedReader in = null;
		String line = null;
		try {
		in = new BufferedReader(new FileReader(getSettingsProblemFile()));
		while ((line = in.readLine()) != null) {
		pw.print("msg,");
		pw.println(line);
		}
		} catch (IOException ignored) {
		} finally {
		IoUtils.closeQuietly(in);
		}
		}
		}
		}