commit 27e06cc2750b2c18701f93d5fdb7978c7f1a2f98
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 12 14:59:20 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 14:59:20 2019 +0000
tree f53b3da6eb5bce2e56d1c773fc685dff07b580ee
parent 1cde07957aa09be82c56d883ad10cec81f0cade7
parent 6783dfb308ec86067e0af3f34e1bc695731bee6f

Merge "Use new UnsupportedAppUsage annotation."

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index abdf168..5597bcd 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -364,7 +364,7 @@
         }
 
         if (err != OK) {
-            aerr << "Error dumping service info status_t: (" << err << ") "
+            aerr << "Error dumping service info status_t: " << statusToString(err) << " "
                  << serviceName << endl;
         }
     });

cmds/installd/binder/android/os/IInstalld.aidl

diff --git a/cmds/installd/binder/android/os/IInstalld.aidl b/cmds/installd/binder/android/os/IInstalld.aidl
index 26e9984..d99bcc8 100644
--- a/cmds/installd/binder/android/os/IInstalld.aidl
+++ b/cmds/installd/binder/android/os/IInstalld.aidl
@@ -127,4 +127,6 @@
 
     const int FLAG_USE_QUOTA = 0x1000;
     const int FLAG_FORCE = 0x2000;
+
+    const int FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES = 0x20000;
 }