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

Merge "Change createRequestInteractAcrossProfilesIntent to throw Exception" into rvc-dev am: cff44bd82e

Browse Source 
Change-Id: I70fa9b1cd958a3a54817d82a79331569be089a6b
This commit is contained in:
TreeHugger Robot
2020-03-19 20:58:35 +00:00
committed by Automerger Merge Worker
parent 6f6ee91a46 cff44bd82e
commit 637afc42f6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -11572,7 +11572,7 @@ package android.content.pm {
public class CrossProfileApps { public class CrossProfileApps {
method public boolean canInteractAcrossProfiles(); method public boolean canInteractAcrossProfiles();
method public boolean canRequestInteractAcrossProfiles(); method public boolean canRequestInteractAcrossProfiles();
method @Nullable public android.content.Intent createRequestInteractAcrossProfilesIntent(); method @NonNull public android.content.Intent createRequestInteractAcrossProfilesIntent();
method @NonNull public android.graphics.drawable.Drawable getProfileSwitchingIconDrawable(@NonNull android.os.UserHandle); method @NonNull public android.graphics.drawable.Drawable getProfileSwitchingIconDrawable(@NonNull android.os.UserHandle);
method @NonNull public CharSequence getProfileSwitchingLabel(@NonNull android.os.UserHandle); method @NonNull public CharSequence getProfileSwitchingLabel(@NonNull android.os.UserHandle);
method @NonNull public java.util.List<android.os.UserHandle> getTargetUserProfiles(); method @NonNull public java.util.List<android.os.UserHandle> getTargetUserProfiles();

9
core/java/android/content/pm/CrossProfileApps.java
View File

@@ -334,7 +334,7 @@ public class CrossProfileApps {
* Returns an {@link Intent} to open the settings page that allows the user to decide whether * Returns an {@link Intent} to open the settings page that allows the user to decide whether
* the calling app can interact across profiles. * the calling app can interact across profiles.
* *
* <p>Returns {@code null} if {@link #canRequestInteractAcrossProfiles()} is {@code false}. * <p>The method {@link #canRequestInteractAcrossProfiles()} must be returning {@code true}.
* *
* <p>Note that the user may already have given consent and the app may already be able to * <p>Note that the user may already have given consent and the app may already be able to
* interact across profiles, even if {@link #canRequestInteractAcrossProfiles()} is {@code * interact across profiles, even if {@link #canRequestInteractAcrossProfiles()} is {@code
@@ -345,11 +345,12 @@ public class CrossProfileApps {
* the app can interact across profiles * the app can interact across profiles
* *
* @throws SecurityException if {@code mContext.getPackageName()} does not belong to the * @throws SecurityException if {@code mContext.getPackageName()} does not belong to the
* calling UID. * calling UID, or {@link #canRequestInteractAcrossProfiles()} is {@code false}.
*/ */
public @Nullable Intent createRequestInteractAcrossProfilesIntent() { public @NonNull Intent createRequestInteractAcrossProfilesIntent() {
if (!canRequestInteractAcrossProfiles()) { if (!canRequestInteractAcrossProfiles()) {
return null; throw new SecurityException(
"The calling package can not request to interact across profiles.");
} }
final Intent settingsIntent = new Intent(); final Intent settingsIntent = new Intent();
settingsIntent.setAction(Settings.ACTION_MANAGE_CROSS_PROFILE_ACCESS); settingsIntent.setAction(Settings.ACTION_MANAGE_CROSS_PROFILE_ACCESS);