diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-15 13:42:57 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-04-15 13:42:57 -0700 |
| commit | e993ae197be29e16fc54f6abf2552cf4973d64bf (patch) | |
| tree | fd90e1bd1ed0e08abecf8f63d253989b2e42584c /core | |
| parent | 7e157f321c690e41f0f18a556f989fd20709469f (diff) | |
| download | frameworks_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')
| -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 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 diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 8821a01..f2c0aa0 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 |