commit | 1835f076b3349741a0cc661675f304d23bfe6fe8 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 23:40:34 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 23:40:40 2017 +0000 |
tree | 4a196d0aa902db12037afffe8e363fb58296f79f | |
parent | 2a3473413119ec44b45837110a06b97171036185 [diff] | |
parent | 6c5631ee7cc716b10b0fa1c7052fab423aec199d [diff] |
Merge "Do not perform backup/restore of instant apps" into oc-dev
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 3f8d508..30de4ba 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -790,6 +790,11 @@ return false; } + // 4. it is an "instant" app + if (app.isInstantApp()) { + return false; + } + // Everything else checks out; the only remaining roadblock would be if the // package were disabled return !appIsDisabled(app, pm);