OSDN Git Service

Merge change 5354 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jun 2009 16:52:28 +0000 (09:52 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jun 2009 16:52:28 +0000 (09:52 -0700)
commit96269e0f8c2d6cad54f0ac8d3767d917f3ba7b4c
tree9014e64321592d3572a4ddf0d64a487b97703501
parentb813c0a72958766ebffdee00ec8e4f0f9465e84e
parent90bbbcbdfa4f2329dfdfda867a4bd58fa27a2840
Merge change 5354 into donut

* changes:
  It seems that there is no quarantee that "onActivityResult()" will be called before "onStart()". So, adding code to handle both situations. Also add checking on "mPaused" in showOnScreenControls().