diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-15 14:06:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 14:06:34 -0700 |
| commit | 18197ec438ea57b2b0bc2847e7f6d903137f9e8c (patch) | |
| tree | 3e84d90526e07f0107c8740c041a665bb7e0393c | |
| parent | edf10b18c5b86bc7e68b79d1bf47ae58e5d3aed3 (diff) | |
| parent | 460071f806337f09ff789892979935916323e6a1 (diff) | |
| download | frameworks_base-18197ec438ea57b2b0bc2847e7f6d903137f9e8c.zip frameworks_base-18197ec438ea57b2b0bc2847e7f6d903137f9e8c.tar.gz frameworks_base-18197ec438ea57b2b0bc2847e7f6d903137f9e8c.tar.bz2 | |
am 460071f8: am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
* commit '460071f806337f09ff789892979935916323e6a1':
Allow non-system apps to use restricted accounts
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 11 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index ff0bea8..64eaf9b 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1898,11 +1898,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 diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 0014877..ad7c51a 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -909,7 +909,7 @@ <!-- Declare that this application requires access to restricted accounts of a certain type. The default value is null and restricted accounts won\'t be visible to this application. The type should correspond to the account authenticator type, such as - "com.google". Only usable by system apps. --> + "com.google". --> <attr name="restrictedAccountType" format="string"/> <!-- Declare that this application requires an account of a certain type. The default value is null and indicates that the application can work without |