tree 9ae7924b7fb9f3686f784a072155044bac7dcbd2
parent 33e1d376ebd643cba5b507d0005b87d49e246bb5
author Dianne Hackborn <hackbod@google.com> 1445560823 -0700
committer Dianne Hackborn <hackbod@google.com> 1445560823 -0700

DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...

...after more than 60 minutes left

The sensing timeout alarm was being cancelled immediately after it
was scheduled it.  Now only cancel it when we are done sensing or
have reset activity.

Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af