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

Commit 821b58a9 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am f5a553a4: am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates... 

am f5a553a4: am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev

* commit 'f5a553a4':
  Allow requiredForAllUsers to work on updates to system apps
parents 9cbe2ae3 f5a553a4

core/java/android/content/RestrictionEntry.java

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public class RestrictionEntry implements Parcelable { 
     */

    public RestrictionEntry(String key, String selectedString) {

        this.key = key;

        this.type = TYPE_CHOICE;

        this.currentValue = selectedString;

    }
@@ -119,6 +120,7 @@ public class RestrictionEntry implements Parcelable { 
     */

    public RestrictionEntry(String key, boolean selectedState) {

        this.key = key;

        this.type = TYPE_BOOLEAN;

        setSelectedState(selectedState);

    }
@@ -129,6 +131,7 @@ public class RestrictionEntry implements Parcelable { 
     */

    public RestrictionEntry(String key, String[] selectedStrings) {

        this.key = key;

        this.type = TYPE_MULTI_SELECT;

        this.currentValues = selectedStrings;

    }

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

+10 −6
Original line number Diff line number Diff line
@@ -293,7 +293,10 @@ public class PackageParser { 
        pi.sharedUserLabel = p.mSharedUserLabel;

        pi.applicationInfo = generateApplicationInfo(p, flags, state, userId);

        pi.installLocation = p.installLocation;

        if ((pi.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0

                || (pi.applicationInfo.flags&ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {

            pi.requiredForAllUsers = p.mRequiredForAllUsers;

        }

        pi.restrictedAccountType = p.mRestrictedAccountType;

        pi.requiredAccountType = p.mRequiredAccountType;

        pi.firstInstallTime = firstInstallTime;
@@ -1893,12 +1896,13 @@ public class PackageParser { 
                    false)) {

                ai.flags |= ApplicationInfo.FLAG_PERSISTENT;

            }

        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestApplication_requiredForAllUsers,

                false)) {

            owner.mRequiredForAllUsers = true;

        }

        }



        String restrictedAccountType = sa.getString(com.android.internal.R.styleable

                .AndroidManifestApplication_restrictedAccountType);