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

Commit df608e39 authored by Rubin Xu's avatar Rubin Xu Committed by Android Git Automerger
Browse files

am 3d521c0a: Merge "Perform post installation operations directly if backup... 

am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev

* commit '3d521c0a':
  Perform post installation operations directly if backup manager is disabled
parents 4e4c37a2 3d521c0a

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

+5 −1
Original line number Diff line number Diff line
@@ -8636,7 +8636,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        if (DEBUG_INSTALL) Log.v(TAG, "token " + token

                                + " to BM for possible restore");

                        try {

                            if (bm.isBackupServiceActive(UserHandle.USER_OWNER)) {

                                bm.restoreAtInstall(res.pkg.applicationInfo.packageName, token);

                            } else {

                                doRestore = false;

                            }

                        } catch (RemoteException e) {

                            // can't happen; the backup manager is local

                        } catch (Exception e) {