Commit 98635ea3 authored Jan 21, 2015 by Christopher Tate Committed by android-build-merger Jan 21, 2015

Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev...

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

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

parents 63e77bf8 fb4fde70

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		});