diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-15 20:59:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 20:59:50 +0000 |
| commit | 919e36d5f689f6a73a879ebd72465f68c1625062 (patch) | |
| tree | 655bf7727e36aae7c6da2e15886225af102e6b3c /core/java | |
| parent | 7fa9667f63fe84a2d17ce899121f32bfcec98864 (diff) | |
| parent | e993ae197be29e16fc54f6abf2552cf4973d64bf (diff) | |
| download | frameworks_base-919e36d5f689f6a73a879ebd72465f68c1625062.zip frameworks_base-919e36d5f689f6a73a879ebd72465f68c1625062.tar.gz frameworks_base-919e36d5f689f6a73a879ebd72465f68c1625062.tar.bz2 | |
Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 11 |
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 |