Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919e36d5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev

parents 7fa9667f e993ae19

core/java/android/content/pm/PackageParser.java

+6 −5
Original line number Diff line number Diff line
@@ -1817,12 +1817,13 @@ 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 requiredAccountType = sa.getString(com.android.internal.R.styleable

                .AndroidManifestApplication_requiredAccountType);

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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