Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev

Browse Source 
* commit '919e36d5f689f6a73a879ebd72465f68c1625062':
  Allow non-system apps to use restricted accounts
This commit is contained in:
Amith Yamasani
2013-04-15 14:02:15 -07:00
committed by Android Git Automerger
parent 29b5e1701b 919e36d5f6
commit 460071f806
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/content/pm/PackageParser.java
View File

@@ -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

2
core/res/res/values/attrs_manifest.xml
View File

@@ -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