commit 7c6cead42a67d20bd7e437975bf533fa2a87e669
author The Android Automerger <android-build@google.com> Tue Sep 09 06:14:17 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 09 06:14:17 2014 -0700
tree 159db35e048418ad9d01b40c6f1375e7800821ca
parent fa143d53a4aa93c51261a65372edcc8a5c8910b3
parent 8df2400b1ad3b40ab4d1af8e26d12ab0f4cadc71

merge in lmp-release history after reset to fa143d53a4aa93c51261a65372edcc8a5c8910b3

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b014040..e2f7dc4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,7 +64,8 @@
             android:excludeFromRecents="true"
             android:immersive="true"
             android:launchMode="singleTop"
-            android:theme="@style/SetupWorkSpaceTheme">
+            android:theme="@style/SetupWorkSpaceTheme"
+            android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -81,7 +82,8 @@
             android:excludeFromRecents="true"
             android:immersive="true"
             android:launchMode="singleTop"
-            android:theme="@style/SetupWorkSpaceTheme">
+            android:theme="@style/SetupWorkSpaceTheme"
+            android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.app.action.ACTION_PROVISION_MANAGED_PROFILE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -97,13 +99,15 @@
             android:name="UserConsentActivity"
             android:immersive="true"
             android:launchMode="singleTop"
-            android:theme="@style/SetupWorkSpaceTheme" >
+            android:theme="@style/SetupWorkSpaceTheme"
+            android:screenOrientation="locked">
         </activity>
         <activity
             android:name="EncryptDeviceActivity"
             android:immersive="true"
             android:launchMode="singleTop"
-            android:theme="@style/SetupWorkSpaceTheme" >
+            android:theme="@style/SetupWorkSpaceTheme"
+            android:screenOrientation="locked">
         </activity>
 
         <service

src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java

diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
index 61f7f77..22656d0 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
@@ -242,7 +242,7 @@
                     }
                 });
 
-        new DeleteNonRequiredAppsTask(
+        mDeleteNonRequiredAppsTask = new DeleteNonRequiredAppsTask(
                 this, params.mDeviceAdminPackageName, UserHandle.USER_OWNER,
                 R.array.required_apps_managed_device, R.array.vendor_required_apps_managed_device,
                 true /* Disable sharing via Nfc and Bluetooth */,
@@ -257,7 +257,7 @@
                     public void onError() {
                         error(R.string.device_owner_error_general);
                     };
-                }).run();
+                });
 
         // Start first task, which starts next task in its callback, etc.
         startFirstTask(params);

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 c14f659..0218f2e 100644
--- a/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
+++ b/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
@@ -108,6 +108,7 @@
 
         File file = new File(mContext.getFilesDir() + File.separator + "system_apps_with_launcher"
                 + File.separator + "user" + mUserId + ".xml");
+        file.getParentFile().mkdirs(); // Creating the folder if it does not exist
 
         Set<String> currentApps = getCurrentSystemApps();
         Set<String> previousApps = readSystemApps(file);
@@ -133,6 +134,8 @@
         Set<String> packagesToDelete = newApps;
         packagesToDelete.removeAll(getRequiredApps());
         packagesToDelete.retainAll(getCurrentAppsWithLauncher());
+        // com.android.telecomm should not handle CALL intents in the managed profile.
+        packagesToDelete.add("com.android.telecomm");
 
         PackageDeleteObserver packageDeleteObserver =
                     new PackageDeleteObserver(packagesToDelete.size());
@@ -233,7 +236,6 @@
         if (!file.exists()) {
             return result;
         }
-        file.getParentFile().mkdirs(); // Creating the folder if it does not exist
         try {
             FileInputStream stream = new FileInputStream(file);