New and Updated patches (egaudet)
[webos-internals:djcin7s-modifications.git] / phone / phone-no-auto-answer-upon-touchstone-removal.patch
1 diff --git a/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js b/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
2 index aa92cd0..8c65f1a 100644
3 --- a/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
4 +++ b/usr/palm/applications/com.palm.app.phone/app/controllers/app-assistant.js
5 @@ -855,8 +855,9 @@ AppAssistant.prototype.createLockStage = function() {
6  
7  // when activated, push lockscreen scene unless there's a call
8  AppAssistant.prototype.onLockScreenActivate = function() {
9 -       if (!(this.telephonyEventListener.incomingCallExists()) 
10 -               && !(this.telephonyEventListener.callExists())) {
11 +       if (this.telephonyEventListener.incomingCallExists()) { 
12 +               this.showLockScreen(); 
13 +       } else if (!(this.telephonyEventListener.callExists())) { 
14                 this.showLockScreen();
15         } 
16  };
17 diff --git a/usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js b/usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js
18 index 6b6ea1a..678ff91 100644
19 --- a/usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js
20 +++ b/usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js
21 @@ -395,7 +395,7 @@ var IncomingcallAssistant = Class.create({
22                                 && this.exposed
23                                 && this.puckConnected === true
24                                 && response.connected === false) {
25 -                                       this.answerIfStillOffPuck.bind(this).delay(0.750);
26 +                                       //this.answerIfStillOffPuck.bind(this).delay(0.750);
27                         }
28                         this.puckConnected = response.connected;
29                 }