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

Commit 6fd49936 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev

parents cadf3969 f0029c1d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -23641,7 +23641,7 @@ package android.os { 
    method public deprecated void setUserRestriction(java.lang.String, boolean);

    method public deprecated void setUserRestrictions(android.os.Bundle);

    method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    field public static final java.lang.String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking";

    field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";

    field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25600,7 +25600,7 @@ package android.os { 
    method public deprecated void setUserRestriction(java.lang.String, boolean);

    method public deprecated void setUserRestrictions(android.os.Bundle);

    method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    field public static final java.lang.String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking";

    field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";

    field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";

core/java/android/os/UserManager.java

+4 −1
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ public class UserManager { 
    public static final String DISALLOW_RECORD_AUDIO = "no_record_audio";



    /**

     * Allows apps in the parent profile to handle web links from the managed profile.

     *

     * This user restriction has an effect only in a managed profile.

     * If set:

     * Intent filters of activities in the parent profile with action
@@ -462,7 +464,8 @@ public class UserManager { 
     * @see #setUserRestrictions(Bundle)

     * @see #getUserRestrictions()

     */

    public static final String ALLOW_PARENT_APP_LINKING = "allow_parent_app_linking";

    public static final String ALLOW_PARENT_PROFILE_APP_LINKING

            = "allow_parent_profile_app_linking";



    /**

     * Application restriction key that is used to indicate the pending arrival

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -4417,7 +4417,7 @@ public class PackageManagerService extends IPackageManager.Stub { 














    private CrossProfileDomainInfo getCrossProfileDomainPreferredLpr(Intent intent,















            String resolvedType, int flags, int sourceUserId, int parentUserId) {













        if (!sUserManager.hasUserRestriction(UserManager.ALLOW_PARENT_APP_LINKING,













        if (!sUserManager.hasUserRestriction(UserManager.ALLOW_PARENT_PROFILE_APP_LINKING,















                sourceUserId)) {















            return null;















        }

































services/core/java/com/android/server/pm/UserManagerService.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -972,7 +972,7 @@ public class UserManagerService extends IUserManager.Stub {













        writeBoolean(serializer, restrictions, UserManager.DISALLOW_OUTGOING_BEAM);















        writeBoolean(serializer, restrictions, UserManager.DISALLOW_WALLPAPER);















        writeBoolean(serializer, restrictions, UserManager.DISALLOW_SAFE_BOOT);













        writeBoolean(serializer, restrictions, UserManager.ALLOW_PARENT_APP_LINKING);













        writeBoolean(serializer, restrictions, UserManager.ALLOW_PARENT_PROFILE_APP_LINKING);















        serializer.endTag(null, TAG_RESTRICTIONS);















    }


























@@ -1104,7 +1104,7 @@ public class UserManagerService extends IUserManager.Stub {













        readBoolean(parser, restrictions, UserManager.DISALLOW_OUTGOING_BEAM);















        readBoolean(parser, restrictions, UserManager.DISALLOW_WALLPAPER);















        readBoolean(parser, restrictions, UserManager.DISALLOW_SAFE_BOOT);













        readBoolean(parser, restrictions, UserManager.ALLOW_PARENT_APP_LINKING);













        readBoolean(parser, restrictions, UserManager.ALLOW_PARENT_PROFILE_APP_LINKING);















    }































    private void readBoolean(XmlPullParser parser, Bundle restrictions,