commit d9233a0fb33ba97888cbc0b70e9efa62c90b5519
author Jeff Sharkey <jsharkey@android.com> Thu Jul 09 18:38:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 09 18:38:57 2015 +0000
tree 4546dd0d144aab88fcce94c69797d834cba0089d
parent 5bcd81c1787262cbba8c22a038e9eb49a2829a6c
parent 159efe23e652952ada23d81aa2f2e308129dffa3

am 159efe23: am 480f0e73: am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev

* commit '159efe23e652952ada23d81aa2f2e308129dffa3':
  Add grant flag support to "install-create" verb.

cmds/pm/src/com/android/commands/pm/Pm.java

diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index ce83caa..2dcd9cb 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -1025,6 +1025,8 @@
                 params.installFlags |= PackageManager.INSTALL_INTERNAL;
             } else if (opt.equals("-d")) {
                 params.installFlags |= PackageManager.INSTALL_ALLOW_DOWNGRADE;
+            } else if (opt.equals("-g")) {
+                params.installFlags |= PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS;
             } else if (opt.equals("--originating-uri")) {
                 params.originatingUri = Uri.parse(nextOptionData());
             } else if (opt.equals("--referrer")) {