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

Commit 65c27970 authored by Robin Lee's avatar Robin Lee
Browse files

Relocate broken getCallingUserId() calls 

This should not be invoked while the calling identity is cleared
because it will return the current user rather than the calling user.

Bug: 17314802
Change-Id: I587daa420b0976d41928ab7c34eeda2329c1341e
parent f6a5d341

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −3
Original line number Diff line number Diff line
@@ -3740,6 +3740,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!mHasFeature) {

            return;

        }

        final int userHandle = UserHandle.getCallingUserId();

        synchronized (this) {

            // Check for permissions

            if (who == null) {
@@ -3753,7 +3754,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            try {

                mUserManager.setUserEnabled(userId);

                Intent intent = new Intent(Intent.ACTION_MANAGED_PROFILE_ADDED);

                intent.putExtra(Intent.EXTRA_USER, new UserHandle(UserHandle.getCallingUserId()));

                intent.putExtra(Intent.EXTRA_USER, new UserHandle(userHandle));

                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY |

                        Intent.FLAG_RECEIVER_FOREGROUND);

                // TODO This should send to parent of profile (which is always owner at the moment).
@@ -3940,6 +3941,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    @Override

    public void addPersistentPreferredActivity(ComponentName who, IntentFilter filter,

            ComponentName activity) {

        final int userHandle = UserHandle.getCallingUserId();



        synchronized (this) {

            if (who == null) {

                throw new NullPointerException("ComponentName is null");
@@ -3949,7 +3952,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            IPackageManager pm = AppGlobals.getPackageManager();

            long id = Binder.clearCallingIdentity();

            try {

                pm.addPersistentPreferredActivity(filter, activity, UserHandle.getCallingUserId());

                pm.addPersistentPreferredActivity(filter, activity, userHandle);

            } catch (RemoteException re) {

                // Shouldn't happen

            } finally {
@@ -3960,6 +3963,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    @Override

    public void clearPackagePersistentPreferredActivities(ComponentName who, String packageName) {

        final int userHandle = UserHandle.getCallingUserId();



        synchronized (this) {

            if (who == null) {

                throw new NullPointerException("ComponentName is null");
@@ -3969,7 +3974,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            IPackageManager pm = AppGlobals.getPackageManager();

            long id = Binder.clearCallingIdentity();

            try {

                pm.clearPackagePersistentPreferredActivities(packageName, UserHandle.getCallingUserId());

                pm.clearPackagePersistentPreferredActivities(packageName, userHandle);

            } catch (RemoteException re) {

                // Shouldn't happen

            } finally {