summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-04-15 13:42:57 -0700
committerAmith Yamasani <yamasani@google.com>2013-04-15 13:42:57 -0700
commite993ae197be29e16fc54f6abf2552cf4973d64bf (patch)
treefd90e1bd1ed0e08abecf8f63d253989b2e42584c /core/java/android/content
parent7e157f321c690e41f0f18a556f989fd20709469f (diff)
downloadframeworks_base-e993ae197be29e16fc54f6abf2552cf4973d64bf.zip
frameworks_base-e993ae197be29e16fc54f6abf2552cf4973d64bf.tar.gz
frameworks_base-e993ae197be29e16fc54f6abf2552cf4973d64bf.tar.bz2
Allow non-system apps to use restricted accounts
Anyway they need to request account access and user will be asked to approve access to the account at runtime. Bug: 8617168 Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageParser.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 3586573..acb3725 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1817,11 +1817,12 @@ public class PackageParser {
false)) {
owner.mRequiredForAllUsers = true;
}
- String restrictedAccountType = sa.getString(com.android.internal.R.styleable
- .AndroidManifestApplication_restrictedAccountType);
- if (restrictedAccountType != null && restrictedAccountType.length() > 0) {
- owner.mRestrictedAccountType = restrictedAccountType;
- }
+ }
+
+ String restrictedAccountType = sa.getString(com.android.internal.R.styleable
+ .AndroidManifestApplication_restrictedAccountType);
+ if (restrictedAccountType != null && restrictedAccountType.length() > 0) {
+ owner.mRestrictedAccountType = restrictedAccountType;
}
String requiredAccountType = sa.getString(com.android.internal.R.styleable