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

Merge "Allow cross-profile interaction when called from the system process."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-10 19:34:53 +00:00
committed by Android (Google) Code Review
parent 48a1f98428 08abd0f05f
commit e39ec317ca
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/content/pm/LauncherApps.java
View File

@@ -16,6 +16,7 @@
package android.content.pm;
import static android.Manifest.permission;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
import android.annotation.NonNull;
@@ -601,11 +602,15 @@ public class LauncherApps {
}
/**
* Show an error log on logcat, when the calling user is a managed profile, and the target
* user is different from the calling user, in order to help developers to detect it.
* Show an error log on logcat, when the calling user is a managed profile, the target
* user is different from the calling user, and it is not called from a package that has the
* {@link permission.INTERACT_ACROSS_USERS_FULL} permission, in order to help
* developers to detect it.
*/
private void logErrorForInvalidProfileAccess(@NonNull UserHandle target) {
if (UserHandle.myUserId() != target.getIdentifier() && mUserManager.isManagedProfile()) {
if (UserHandle.myUserId() != target.getIdentifier() && mUserManager.isManagedProfile()
&& mContext.checkSelfPermission(permission.INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "Accessing other profiles/users from managed profile is no longer allowed.");
}
}