From 4b8c7f67aca0825203338a066b3148c2fbb98587 Mon Sep 17 00:00:00 2001
From: Johan Toras Halseth <johanth@google.com>
Date: Wed, 5 Apr 2017 20:37:52 +0100
Subject: [PATCH] Change flag from -includekeyvalue to -keyvalue/-nokeyvalue

The original flag was added in ag/1946677. As pointed out
in ag/2065837 we ought to stick to the syntax used for
other flags.

Test: adb backup -keyvalue -all
Change-Id: Ie2c7ee3d85740abadaa4119d23470cd9470bd981
---
 cmds/bu/src/com/android/commands/bu/Backup.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmds/bu/src/com/android/commands/bu/Backup.java b/cmds/bu/src/com/android/commands/bu/Backup.java
index db17b28b81823..ce114fd02475f 100644
--- a/cmds/bu/src/com/android/commands/bu/Backup.java
+++ b/cmds/bu/src/com/android/commands/bu/Backup.java
@@ -101,8 +101,10 @@ public final class Backup {
                     doCompress = true;
                 } else if ("-nocompress".equals(arg)) {
                     doCompress = false;
-                } else if ("-includekeyvalue".equals(arg)) {
+                } else if ("-keyvalue".equals(arg)) {
                     doKeyValue = true;
+                } else if ("-nokeyvalue".equals(arg)) {
+                    doKeyValue = false;
                 } else {
                     Log.w(TAG, "Unknown backup flag " + arg);
                     continue;