commit 9af1a325f6bd611231748788819d408af0f0d55b
author arangelov <arangelov@google.com> Mon Apr 23 17:16:05 2018 +0100
committer arangelov <arangelov@google.com> Mon Apr 23 18:29:04 2018 +0100
tree de3330ea51c097b665379bfac6cf14ac92144fd9
parent 751673a674379f856aa4311d0d8fc3cab31d038c

Pass the actual EnforcedAdmin in the sendShowAdminSupportDetailsIntent
call.

Test: Manual
Bug: 78447967
Bug: 71346595
Change-Id: Iec5b6b3d0582b6e7b190b22b7be5a52038b7c9f9

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

diff --git a/src/com/android/server/telecom/components/UserCallIntentProcessor.java b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
index 1a76043..0c8525f 100644
--- a/src/com/android/server/telecom/components/UserCallIntentProcessor.java
+++ b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
@@ -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.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 @@
                     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;
                 }
             }