summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-04-26 10:48:05 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 15:20:00 -0700
commit3fd4eb2d6b5b64b6b1d25dc0787ed4ff6f7995c1 (patch)
tree938657d5385f060b8a655e0ded7fbcc2f122184d
parenta4aafe747c7d4b69ea36ec98d6f54fb5cabb4b8b (diff)
downloadpackages_apps_InCallUI-3fd4eb2d6b5b64b6b1d25dc0787ed4ff6f7995c1.tar.gz
packages_apps_InCallUI-3fd4eb2d6b5b64b6b1d25dc0787ed4ff6f7995c1.tar.bz2
packages_apps_InCallUI-3fd4eb2d6b5b64b6b1d25dc0787ed4ff6f7995c1.zip
InCallUI: Call internalResolveIntent() in onCreat() method
Only call internalResolveIntent() method in onNewIntent() method, if the user exit InCallUI with back key, and re-enter it via dialer, the dialpad will not be displayed. Call internalResolveIntent() in onCreat() method. CRs-Fixed: 654611 Conflicts: src/com/android/incallui/InCallActivity.java Change-Id: I23ef123c556aeb191bd041b478becd149ac408ec
-rw-r--r--src/com/android/incallui/InCallActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index db3ee5ce..d0589181 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -148,6 +148,16 @@ public class InCallActivity extends Activity {
false, mSettingsObserver);
updateSettings();
+ // Handle the Intent we were launched with, but only if this is the
+ // the very first time we're being launched (ie. NOT if we're being
+ // re-initialized after previously being shut down.)
+ // Once we're up and running, any future Intents we need
+ // to handle will come in via the onNewIntent() method.
+ if (icicle == null) {
+ Log.d(this, "this is our very first launch, checking intent...");
+ internalResolveIntent(getIntent());
+ }
+
Log.d(this, "onCreate(): exit");
}