diff options
| author | Christopher Tate <ctate@google.com> | 2015-01-21 00:08:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-21 00:08:18 +0000 |
| commit | 98635ea39290644db1381b151124b586e1116403 (patch) | |
| tree | 17c7000951d2e81f7fac70561faec161855757f0 /packages/SystemUI | |
| parent | 63e77bf8a5be6844bd8fd9d07cd303f6dc72c64e (diff) | |
| parent | fb4fde7053ba4bbba79175c31f7cdcac464b4c1c (diff) | |
| download | frameworks_base-98635ea39290644db1381b151124b586e1116403.zip frameworks_base-98635ea39290644db1381b151124b586e1116403.tar.gz frameworks_base-98635ea39290644db1381b151124b586e1116403.tar.bz2 | |
Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 automerge: 78a05de
automerge: fb4fde7
* commit 'fb4fde7053ba4bbba79175c31f7cdcac464b4c1c':
Don't try to launch broadcast receivers during boot
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/SecureCameraLaunchManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SecureCameraLaunchManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SecureCameraLaunchManager.java index 3f5cf3f..4a43c47 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SecureCameraLaunchManager.java +++ b/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); } }); |