From 9b991dcdd1101d3fe1a9b1be39ca983eb3562cb7 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Tue, 16 Sep 2014 13:32:49 -0700 Subject: [PATCH] Fixed the bug where user cannot accept ncoming call Update app id of Modello phone app to the newer one used in crosswalk, this will fix the issue where accepting incoming call doesn't launch the phone app. Change-Id: Iad61129f6b95d7804f38832bbb6a66e7079fdd65 Signed-off-by: Jimmy Huang --- css/car/components/incomingCall/incomingCall.js | 8 ++++---- js/services/bootstrap.js | 4 ++-- packaging/modello-common.changes | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/css/car/components/incomingCall/incomingCall.js b/css/car/components/incomingCall/incomingCall.js index ca3a6b6..c9b1aac 100644 --- a/css/car/components/incomingCall/incomingCall.js +++ b/css/car/components/incomingCall/incomingCall.js @@ -82,18 +82,18 @@ IncomingCall.prototype.hide = function() { } }; /** - * Method accepts incoming call. If application where call is accepted isn't Phone application (`intelPoc15.phone`), then launches Phone application. - * If apllication where call is accepted is Phone application (`intelPoc15.phone`), call {{#crossLink "Phone/acceptCall:method"}}{{/crossLink}} method. + * Method accepts incoming call. If application where call is accepted isn't Phone application (`Modello009.Phone`), then launches Phone application. + * If apllication where call is accepted is Phone application (`Modello009.Phone`), call {{#crossLink "Phone/acceptCall:method"}}{{/crossLink}} method. * @method acceptIncommingCall */ IncomingCall.prototype.acceptIncommingCall = function() { "use strict"; /* todo add call to phone application */ this.hide(); - var appId = getAppByID('intelPoc15.phone'); + var appId = getAppByID('Modello009.Phone'); /* if app isn't phone */ if (!appId.running) { - launchApplication('intelPoc15.phone'); + launchApplication('Modello009.Phone'); /* if app is phone */ } else { if (typeof(tizen) !== 'undefined' && tizen.phone) { diff --git a/js/services/bootstrap.js b/js/services/bootstrap.js index 645e910..91cbc58 100644 --- a/js/services/bootstrap.js +++ b/js/services/bootstrap.js @@ -151,7 +151,7 @@ Bootstrap.prototype.initIncomingCall = function(callback) { if (typeof(tizen) !== 'undefined' && tizen.phone) { tizen.phone.addCallChangedListener(function(result) { /* global getAppByID */ - var appId = getAppByID('intelPoc15.phone'); + var appId = getAppByID('Modello009.Phone'); var contact; var activeCall = tizen.phone.activeCall(); @@ -183,7 +183,7 @@ Bootstrap.prototype.initIncomingCall = function(callback) { case "DIALING".toLowerCase(): if (!appId.running) { /*global launchApplication*/ - launchApplication('intelPoc15.phone'); + launchApplication('Modello009.Phone'); } break; case "INCOMING".toLowerCase(): diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes index d3a7b5e..04ed4d8 100644 --- a/packaging/modello-common.changes +++ b/packaging/modello-common.changes @@ -1,3 +1,6 @@ +* Tue Sep 16 2014 Jimmy Huang submit/tizen_ivi/20140911.180109-1-g285968a +- Fixed the bug where user cannot accept ncoming call + * Wed Sep 10 2014 Brian Jones accepted/tizen/ivi/20140821.133859-3-gf761b8f - Removing space in app name - Fix for TC-1404 Updating tizen.vehicle API to use the new API -- 2.7.4