Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c716c9 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Revert "Allow restoring of apps that rotated key" 

This reverts commit 313d225c.

Reason for revert: b/74159113

Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb
parent 0db51ad5

core/java/android/content/pm/PackageManagerInternal.java

+0 −12
Original line number Diff line number Diff line
@@ -544,16 +544,4 @@ public abstract class PackageManagerInternal { 
    /** Updates the flags for the given permission. */

    public abstract void updatePermissionFlagsTEMP(@NonNull String permName,

            @NonNull String packageName, int flagMask, int flagValues, int userId);



    /**

     * Returns true if it's still safe to restore data backed up from this app's version

     * that was signed with restoringFromSigHash.

     */

    public abstract boolean isDataRestoreSafe(byte[] restoringFromSigHash, String packageName);



    /**

     * Returns true if it's still safe to restore data backed up from this app's version

     * that was signed with restoringFromSig.

     */

    public abstract boolean isDataRestoreSafe(Signature restoringFromSig, String packageName);

}

services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java

+2 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.ComponentName; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.ResolveInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.Signature;
@@ -31,7 +30,6 @@ import android.os.Build; 
import android.os.ParcelFileDescriptor;

import android.util.Slog;



import com.android.server.LocalServices;

import com.android.server.backup.utils.AppBackupUtils;



import java.io.BufferedInputStream;
@@ -237,7 +235,7 @@ public class PackageManagerBackupAgent extends BackupAgent { 
        if (home != null) {

            try {

                homeInfo = mPackageManager.getPackageInfo(home.getPackageName(),

                        PackageManager.GET_SIGNING_CERTIFICATES);

                        PackageManager.GET_SIGNATURES);

                homeInstaller = mPackageManager.getInstallerPackageName(home.getPackageName());

                homeVersion = homeInfo.getLongVersionCode();

                homeSigHashes = BackupUtils.hashSignatureArray(homeInfo.signatures);
@@ -254,11 +252,10 @@ public class PackageManagerBackupAgent extends BackupAgent { 
            //    2. the home app [or absence] we now use differs from the prior state,

            // OR 3. it looks like we use the same home app + version as before, but

            //       the signatures don't match so we treat them as different apps.

            PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);

            final boolean needHomeBackup = (homeVersion != mStoredHomeVersion)

                    || !Objects.equals(home, mStoredHomeComponent)

                    || (home != null

                        && !BackupUtils.signaturesMatch(mStoredHomeSigHashes, homeInfo, pmi));

                        && !BackupUtils.signaturesMatch(mStoredHomeSigHashes, homeInfo));

            if (needHomeBackup) {

                if (DEBUG) {

                    Slog.i(TAG, "Home preference changed; backing up new state " + home);

services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java

+1 −6
Original line number Diff line number Diff line
@@ -36,13 +36,11 @@ import android.app.backup.IFullBackupRestoreObserver; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManagerInternal;

import android.content.pm.Signature;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.util.Slog;



import com.android.server.LocalServices;

import com.android.server.backup.BackupRestoreTask;

import com.android.server.backup.FileMetadata;

import com.android.server.backup.KeyValueAdbRestoreEngine;
@@ -209,11 +207,8 @@ public class FullRestoreEngine extends RestoreEngine { 
                if (info.path.equals(BACKUP_MANIFEST_FILENAME)) {

                    Signature[] signatures = tarBackupReader.readAppManifestAndReturnSignatures(

                            info);

                    PackageManagerInternal pmi = LocalServices.getService(

                            PackageManagerInternal.class);

                    RestorePolicy restorePolicy = tarBackupReader.chooseRestorePolicy(

                            mBackupManagerService.getPackageManager(), allowApks, info, signatures,

                            pmi);

                            mBackupManagerService.getPackageManager(), allowApks, info, signatures);

                    mManifestSignatures.put(info.packageName, signatures);

                    mPackagePolicies.put(pkg, restorePolicy);

                    mPackageInstallers.put(pkg, info.installerPackageName);

services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java

+1 −5
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.app.backup.IFullBackupRestoreObserver; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManagerInternal;

import android.content.pm.Signature;

import android.os.Environment;

import android.os.ParcelFileDescriptor;
@@ -48,7 +47,6 @@ import android.os.RemoteException; 
import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.LocalServices;

import com.android.server.backup.BackupManagerService;

import com.android.server.backup.FileMetadata;

import com.android.server.backup.KeyValueAdbRestoreEngine;
@@ -472,11 +470,9 @@ public class PerformAdbRestoreTask implements Runnable { 
                if (info.path.equals(BACKUP_MANIFEST_FILENAME)) {

                    Signature[] signatures = tarBackupReader.readAppManifestAndReturnSignatures(

                            info);

                    PackageManagerInternal pmi = LocalServices.getService(

                            PackageManagerInternal.class);

                    RestorePolicy restorePolicy = tarBackupReader.chooseRestorePolicy(

                            mBackupManagerService.getPackageManager(), allowApks,

                            info, signatures, pmi);

                            info, signatures);

                    mManifestSignatures.put(info.packageName, signatures);

                    mPackagePolicies.put(pkg, restorePolicy);

                    mPackageInstallers.put(pkg, info.installerPackageName);

services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java

+2 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.app.backup.RestoreDescription; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.os.Message;
@@ -58,7 +57,6 @@ import android.util.Slog; 
import com.android.internal.backup.IBackupTransport;

import com.android.server.AppWidgetBackupBridge;

import com.android.server.EventLogTags;

import com.android.server.LocalServices;

import com.android.server.backup.BackupRestoreTask;

import com.android.server.backup.BackupUtils;

import com.android.server.backup.PackageManagerBackupAgent;
@@ -506,7 +504,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { 


            try {

                mCurrentPackage = backupManagerService.getPackageManager().getPackageInfo(

                        pkgName, PackageManager.GET_SIGNING_CERTIFICATES);

                        pkgName, PackageManager.GET_SIGNATURES);

            } catch (NameNotFoundException e) {

                // Whoops, we thought we could restore this package but it

                // turns out not to be present.  Skip it.
@@ -621,8 +619,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { 
        }



        Metadata metaInfo = mPmAgent.getRestoredMetadata(packageName);

        PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);

        if (!BackupUtils.signaturesMatch(metaInfo.sigHashes, mCurrentPackage, pmi)) {

        if (!BackupUtils.signaturesMatch(metaInfo.sigHashes, mCurrentPackage)) {

            Slog.w(TAG, "Signature mismatch restoring " + packageName);

            mMonitor = BackupManagerMonitorUtils.monitorEvent(mMonitor,

                    BackupManagerMonitor.LOG_EVENT_ID_SIGNATURE_MISMATCH, mCurrentPackage,