tree 69f37167fb113c9049af624f77a611f7d96b5bf9
parent 736b7074812d0723593ece3006290719255bcb7b
author Jose Lima <joselima@google.com> 1422470595 -0800
committer The Android Automerger <android-build@google.com> 1422481009 -0800

Fix crash caused by disabling the Options panel on TVs

   Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1