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

Commit 9af1a325 authored by arangelov's avatar arangelov
Browse files

Pass the actual EnforcedAdmin in the sendShowAdminSupportDetailsIntent 

call.

Test: Manual
Bug: 78447967
Bug: 71346595
Change-Id: Iec5b6b3d0582b6e7b190b22b7be5a52038b7c9f9
parent 751673a6

src/com/android/server/telecom/components/UserCallIntentProcessor.java

+17 −10
Original line number Diff line number Diff line
@@ -16,14 +16,7 @@ 


package com.android.server.telecom.components;



import com.android.server.telecom.CallIntentProcessor;

import com.android.server.telecom.R;

import com.android.server.telecom.TelecomSystem;

import com.android.server.telecom.TelephonyUtil;

import com.android.server.telecom.UserUtil;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;
@@ -37,6 +30,12 @@ import android.telecom.VideoProfile; 
import android.telephony.PhoneNumberUtils;

import android.text.TextUtils;



import com.android.server.telecom.CallIntentProcessor;

import com.android.server.telecom.R;

import com.android.server.telecom.TelecomSystem;

import com.android.server.telecom.TelephonyUtil;

import com.android.server.telecom.UserUtil;



// TODO: Needed for move to system service: import com.android.internal.R;



/**
@@ -126,8 +125,16 @@ public class UserCallIntentProcessor { 
                    return;

                } else if (userManager.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS,

                        mUserHandle)) {

                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,

                            EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);

                    final DevicePolicyManager dpm =

                            mContext.getSystemService(DevicePolicyManager.class);

                    if (dpm == null) {

                        return;

                    }

                    final Intent adminSupportIntent = dpm.createAdminSupportIntent(

                            UserManager.DISALLOW_OUTGOING_CALLS);

                    if (adminSupportIntent != null) {

                        mContext.startActivity(adminSupportIntent);

                    }

                    return;

                }

            }