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

Merge "Use LocalService to access UserManagerServcie from DragState."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-17 02:05:20 +00:00
committed by Android (Google) Code Review
parent 972bad7924 01b645072c
commit 3442a4922e
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/DragState.java
View File

@@ -42,6 +42,7 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.IUserManager;
import android.os.UserManagerInternal;
import android.util.Slog;
import android.view.Display;
import android.view.DragEvent;
@@ -55,6 +56,7 @@ import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
import com.android.internal.view.IDragAndDropPermissions;
import com.android.server.LocalServices;
import com.android.server.input.InputApplicationHandle;
import com.android.server.input.InputWindowHandle;
@@ -318,15 +320,9 @@ class DragState {
mSourceUserId = UserHandle.getUserId(mUid);
final IUserManager userManager =
(IUserManager) ServiceManager.getService(Context.USER_SERVICE);
try {
mCrossProfileCopyAllowed = !userManager.getUserRestrictions(mSourceUserId).getBoolean(
UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE);
} catch (RemoteException e) {
Slog.e(TAG_WM, "Remote Exception calling UserManager: " + e);
mCrossProfileCopyAllowed = false;
}
final UserManagerInternal userManager = LocalServices.getService(UserManagerInternal.class);
mCrossProfileCopyAllowed = !userManager.getUserRestriction(
mSourceUserId, UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE);
if (DEBUG_DRAG) {
Slog.d(TAG_WM, "broadcasting DRAG_STARTED at (" + touchX + ", " + touchY + ")");