commit 6b629c24e23769f6de8bd897ec70b1ce2e97d4a2
author Alexandra Gherghina <alexgherghina@google.com> Wed Jul 23 15:33:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 23 15:33:37 2014 +0000
tree a4b0b0cc9046e60e6ea56fdf7e6ec5f25273ff06
parent 336c63bc9a1d5c0d1cfbe85faac2e15158c3d90d
parent 9b27c773457a0485335d25c80c070a996264f1c5

am 9b27c773: am f1d6e989: am 0b5f3bc6: Merge "Remove cross-profile package intents for Settings" into lmp-dev

* commit '9b27c773457a0485335d25c80c070a996264f1c5':
  Remove cross-profile package intents for Settings

src/com/android/managedprovisioning/ManagedProvisioningService.java

diff --git a/src/com/android/managedprovisioning/ManagedProvisioningService.java b/src/com/android/managedprovisioning/ManagedProvisioningService.java
index 3dfd398..1dbd066 100644
--- a/src/com/android/managedprovisioning/ManagedProvisioningService.java
+++ b/src/com/android/managedprovisioning/ManagedProvisioningService.java
@@ -390,16 +390,6 @@
         recognizeSpeech.addCategory(Intent.CATEGORY_DEFAULT);
         pm.addCrossProfileIntentFilter(recognizeSpeech, mManagedProfileUserInfo.id,
                 UserHandle.USER_OWNER, 0);
-
-
-        try {
-            mIpm.addCrossProfileIntentsForPackage("com.android.settings",
-                    mManagedProfileUserInfo.id,
-                    Process.myUserHandle().getIdentifier());
-        } catch (RemoteException neverThrown) {
-            // If the package manager is not working, we've got bigger problems.
-            ProvisionLogger.loge("This should not happen.", neverThrown);
-        }
     }
 
     /**