After bug 880588 is fixed, all inline activities won't be remove by system app when screen is locked. However we still expect camera to close itself while running as an inline activity while screen is locked or brought to background. Currently this fails to happen because: 0) When visibility is hidden 1) Camera stops preview -> disable all buttons 2) Camera cancel pick activity -> check pick is disabled or not, if disable, don't cancel. I think the check is redundant. Just check this._pendingPick is enough

Patch v1: Don't need to check the disable state of cancel button when we want to cancel pick activity.

Note: the patch is toward v1-train. leo would leo+ this bug as discussion w/ me.

Thank you, Alive, for the patch. Yes, we need this to land on v1-train before we apply the patch of bug 880588.

Comment on attachment 768197 [details] https://github.com/mozilla-b2g/gaia/pull/10660 Cheers Alive Merged in: https://github.com/mozilla-b2g/gaia/commit/8cf51034094a7829803c062f47ce7a907ade7edc

Cherry picked onto master: https://github.com/mozilla-b2g/gaia/commit/70a5036bd2925749a9b5661893eaa0e5a6b9878e Personally I think its easier if we do these patches on master then backport when needed, gets confusing when patches start flowing both ways (but this was a small patch, so not a big deal) Cheers

(In reply to Dale Harvey (:daleharvey) from comment #5) > Cherry picked onto master: > https://github.com/mozilla-b2g/gaia/commit/ > 70a5036bd2925749a9b5661893eaa0e5a6b9878e > > Personally I think its easier if we do these patches on master then backport > when needed, gets confusing when patches start flowing both ways (but this > was a small patch, so not a big deal) > > Cheers Sure as you said, I do that because it's easy for leo guy to test.

I was not able to uplift this bug to v1-train. If this bug has dependencies which are not marked in this bug, please comment on this bug. If this bug depends on patches that aren't approved for v1-train, we need to re-evaluate the approval. Otherwise, if this is just a merge conflict, you might be able to resolve it with: git checkout v1-train git cherry-pick -x 70a5036bd2925749a9b5661893eaa0e5a6b9878e <RESOLVE MERGE CONFLICTS> git commit

v1.1.0hd: 8cf51034094a7829803c062f47ce7a907ade7edc v1.1.0hd: b7a2ae5bd9e88caf99d9aba42cf8f7077dfeee8c

(In reply to John Ford [:jhford] -- please use 'needinfo?' instead of a CC from comment #8) > v1.1.0hd: 8cf51034094a7829803c062f47ce7a907ade7edc > v1.1.0hd: b7a2ae5bd9e88caf99d9aba42cf8f7077dfeee8c Does this mean it made v1-train as well?

already on v1-train, sorry I forgot to change status.

Issue no longer reproduces on the Leo, Build ID: 20130722070207 Gecko: http://hg.mozilla.org/releases/mozilla-b2g18/rev/68fb0a2e0114 Gaia: 41d10fb10be6916e6554eb440d9a97130ef23ce0 Platform Version: 18.1 Camera activity should is closing when user go to background.