diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-02-09 19:33:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-09 19:33:19 +0000 |
| commit | df608e39b35e37490f8752b0902d9894f8d8940b (patch) | |
| tree | 031f3a11d2f7e133f6931730be84df1826cbaf7b /services/core/java | |
| parent | 4e4c37a2da064cf0d4bbd508a186a6c44563d966 (diff) | |
| parent | 3d521c0a0165dfef53e3c9d3d562bc0ec45405a8 (diff) | |
| download | frameworks_base-df608e39b35e37490f8752b0902d9894f8d8940b.zip frameworks_base-df608e39b35e37490f8752b0902d9894f8d8940b.tar.gz frameworks_base-df608e39b35e37490f8752b0902d9894f8d8940b.tar.bz2 | |
am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
* commit '3d521c0a0165dfef53e3c9d3d562bc0ec45405a8':
Perform post installation operations directly if backup manager is disabled
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 5b17eaa..cc0a30a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8636,7 +8636,11 @@ public class PackageManagerService extends IPackageManager.Stub { if (DEBUG_INSTALL) Log.v(TAG, "token " + token + " to BM for possible restore"); try { - bm.restoreAtInstall(res.pkg.applicationInfo.packageName, token); + 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) { |