summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Maples <joe@frap129.org> 2018-02-28 23:49:49 +0000
committer android-build-merger <android-build-merger@google.com> 2018-02-28 23:49:49 +0000
commita79fef132b66d2454b032ede7a0c7cc6a7b5716f (patch)
tree3d8b3c126c6a2a8fdf26b928ff9a69e9ff6a3656
parent41fa5ff101a371c221d4827ec8835231b1ba1a96 (diff)
parenta12e18bcd1686e8fd6222d15bac12961b42a68bc (diff)
Merge "pm: Fix typo in error"
am: a12e18bcd1 Change-Id: I924eef635de153a0277da49c804f2c7dc1c97a4d
-rw-r--r--core/java/android/content/pm/PackageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index a3e3354ee087..0e74d9ec2c50 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3304,7 +3304,7 @@ public class PackageParser {
&& (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) == 0
&& (perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE) !=
PermissionInfo.PROTECTION_SIGNATURE) {
- outError[0] = "<permission> protectionLevel specifies a non-instnat flag but is "
+ outError[0] = "<permission> protectionLevel specifies a non-instant flag but is "
+ "not based on signature type";
mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;
return false;