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

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

Browse Source
This commit is contained in:
Aleks Todorov
2021-11-08 15:36:01 +00:00
committed by Android (Google) Code Review
parent ef38b3af08 9a9d8a5840
commit 3ea95bee3d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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}.
*

8
core/java/android/app/admin/DevicePolicyManagerInternal.java
View File

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