Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6

automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot

packages/SystemUI/src/com/android/systemui/statusbar/phone/SecureCameraLaunchManager.java

@@ -175,6 +175,7 @@ public class SecureCameraLaunchManager {
                 public void run() {
                     Intent intent = new Intent();
                     intent.setAction(CLOSE_CAMERA_ACTION_NAME);
+                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
                     mContext.sendBroadcast(intent);
                 }
             });