Merge "Crash in Phone observed while launching SIM Toolkit app" into lmp-mr1-dev

2 files changed, 7 insertions, 5 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b7fc8fe..7ecc8cd 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -98,6 +98,7 @@
         <receiver android:name="com.android.stk.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.USER_INITIALIZE" />
             </intent-filter>
         </receiver>
 
diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index 8fb938c..ff46a50 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -38,6 +38,12 @@ public class BootCompletedReceiver extends BroadcastReceiver {
 
         // make sure the app icon is removed every time the device boots.
         if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
+            Bundle args = new Bundle();
+            args.putInt(StkAppService.OPCODE, StkAppService.OP_BOOT_COMPLETED);
+            context.startService(new Intent(context, StkAppService.class)
+                    .putExtras(args));
+            CatLog.d(LOG_TAG, "[ACTION_BOOT_COMPLETED]");
+        } else if(action.equals(Intent.ACTION_USER_INITIALIZE)) {
             if (!android.os.Process.myUserHandle().isOwner()) {
                 //Disable package for all secondary users. Package is only required for device
                 //owner.
@@ -45,11 +51,6 @@ public class BootCompletedReceiver extends BroadcastReceiver {
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
                 return;
             }
-            Bundle args = new Bundle();
-            args.putInt(StkAppService.OPCODE, StkAppService.OP_BOOT_COMPLETED);
-            context.startService(new Intent(context, StkAppService.class)
-                    .putExtras(args));
-            CatLog.d(LOG_TAG, "[ACTION_BOOT_COMPLETED]");
         }
     }
 }