commit e8c963984f43e8e6952fc046fe46b3b139654f49
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 02 02:01:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 02 02:01:16 2016 +0000
tree 843a2dae9193dd913ed0962da7923a52c9574c83
parent 48b281a4372962c05aeb8459806fd52e01e6f0ad
parent 32d07dce7adc23723ca2b9f76d9542a35a5ffa6b

Merge "Disallow sharedUserId in Ephemeral apps"

core/java/android/content/pm/PackageParser.java

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index a910271..f363bd8 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1701,6 +1701,11 @@
         String str = sa.getNonConfigurationString(
                 com.android.internal.R.styleable.AndroidManifest_sharedUserId, 0);
         if (str != null && str.length() > 0) {
+            if ((flags & PARSE_IS_EPHEMERAL) != 0) {
+                outError[0] = "sharedUserId not allowed in ephemeral application";
+                mParseError = PackageManager.INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID;
+                return null;
+            }
             String nameError = validateName(str, true, false);
             if (nameError != null && !"android".equals(pkg.packageName)) {
                 outError[0] = "<manifest> specifies bad sharedUserId name \""