commit a653eae43828f7d09d20ece528a3d97eaed70d73
author Sander Alewijnse <salewijnse@google.com> Fri Nov 21 16:29:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 21 16:29:53 2014 +0000
tree 2e656dadd7dbd6589ef7a89f586e836a77a07094
parent 88b897e711db91403062eb9de1d649ee8d714ce0
parent 93f6317274da2298918a5426d482faebff55498b

am 93f63172: am 4aa53b43: am 457f6d03: Merge "Do NOT delete com.android.server.telecom for Device Owners." into lmp-mr1-dev

* commit '93f6317274da2298918a5426d482faebff55498b':
  Do NOT delete com.android.server.telecom for Device Owners.

src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java

diff --git a/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java b/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
index 6f4188f..924ff25 100644
--- a/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
+++ b/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
@@ -68,7 +68,7 @@
     private final int mVendorReqAppsList;
     private final int mUserId;
     private final boolean mNewProfile; // If we are provisioning a new managed profile/device.
-    private final boolean mDisableInstallShortcutListeners;
+    private final boolean mDisableInstallShortcutListenersAndTelecom;
 
     private static final String TAG_SYSTEM_APPS = "system-apps";
     private static final String TAG_PACKAGE_LIST_ITEM = "item";
@@ -76,7 +76,7 @@
 
     public DeleteNonRequiredAppsTask(Context context, String mdmPackageName, int userId,
             int requiredAppsList, int vendorRequiredAppsList, boolean newProfile,
-            boolean disableInstallShortcutListeners, Callback callback) {
+            boolean disableInstallShortcutListenersAndTelecom, Callback callback) {
         mCallback = callback;
         mContext = context;
         mMdmPackageName = mdmPackageName;
@@ -86,7 +86,7 @@
         mReqAppsList = requiredAppsList;
         mVendorReqAppsList = vendorRequiredAppsList;
         mNewProfile = newProfile;
-        mDisableInstallShortcutListeners = disableInstallShortcutListeners;
+        mDisableInstallShortcutListenersAndTelecom = disableInstallShortcutListenersAndTelecom;
     }
 
     public void run() {
@@ -140,7 +140,7 @@
         Set<String> newApps = currentApps;
         newApps.removeAll(previousApps);
 
-        if (mDisableInstallShortcutListeners) {
+        if (mDisableInstallShortcutListenersAndTelecom) {
             Intent actionShortcut = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
             if (previousApps.isEmpty()) {
                 // Here, all the apps are in newApps.
@@ -159,7 +159,7 @@
         packagesToDelete.removeAll(getRequiredApps());
         packagesToDelete.retainAll(getCurrentAppsWithLauncher());
         // com.android.server.telecom should not handle CALL intents in the managed profile.
-        if (mNewProfile) {
+        if (mDisableInstallShortcutListenersAndTelecom && mNewProfile) {
             packagesToDelete.add("com.android.server.telecom");
         }
         if (packagesToDelete.isEmpty()) {