commit e673650aff90e1c35e6084507ac98456cbbb0f84
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 08:43:31 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 08:43:31 2018 -0700
tree b70939942bafb4fe158a0fda87202c0ebffc1653
parent 73090aa5606b5e6955535960c77eba7b34406b4c
parent 494113e74a6bee121f880cb530da0d7841d4c276

Merge "Don't run obb backup for shared storage backup package." into pi-dev
am: 494113e74a

Change-Id: I5eea028f21a2a91c94855255cb25607f81324b73

services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java

diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
index 821cca1..44edabc 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
@@ -421,7 +421,7 @@
 
                 // after the app's agent runs to handle its private filesystem
                 // contents, back up any OBB content it has on its behalf.
-                if (mIncludeObbs) {
+                if (mIncludeObbs && !isSharedStorage) {
                     boolean obbOkay = obbConnection.backupObbs(pkg, out);
                     if (!obbOkay) {
                         throw new RuntimeException("Failure writing OBB stack for " + pkg);