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

Commit 3ea95bee authored by Aleks Todorov's avatar Aleks Todorov Committed by Android (Google) Code Review
Browse files

Merge "Fix DevicePolicyManager#getDefaultCrossProfilePackages referring to user consent."

parents ef38b3af 9a9d8a58

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -13351,8 +13351,8 @@ public class DevicePolicyManager { 
    }















    /**













     * Returns the default package names set by the OEM that are allowed to request user consent for













     * cross-profile communication without being explicitly enabled by the admin, via {@link













     * Returns the default package names set by the OEM that are allowed to communicate













     * cross-profile without being explicitly enabled by the admin, via {@link















     * com.android.internal.R.array#cross_profile_apps} and {@link com.android.internal.R.array















     * #vendor_cross_profile_apps}.















     *

























core/java/android/app/admin/DevicePolicyManagerInternal.java



+4
−4






























Original line number
Diff line number
Diff line








@@ -200,10 +200,10 @@ public abstract class DevicePolicyManagerInternal {













    public abstract List<String> getAllCrossProfilePackages();































    /**













     * Returns the default package names set by the OEM that are allowed to request user consent for













     * cross-profile communication without being explicitly enabled by the admin, via













     * {@link com.android.internal.R.array#cross_profile_apps} and













     * {@link com.android.internal.R.array#vendor_cross_profile_apps}.













     * Returns the default package names set by the OEM that are allowed to communicate













     * cross-profile without being explicitly enabled by the admin, via {@link













     * com.android.internal.R.array#cross_profile_apps} and {@link













     * com.android.internal.R.array#vendor_cross_profile_apps}.















     *















     * @hide















     */