telephony-service

Merge lp:~phablet-team/telephony-service/midori-workaround into lp:telephony-service

  1. midori-workaround
  2. Merge into trunk
Proposed by Alfonso Sanchez-Beato
Status: Needs review
Proposed branch: lp:~phablet-team/telephony-service/midori-workaround
Merge into: lp:telephony-service
Diff against target: 122 lines (+21/-21)
4 files modified
approver/approver.cpp (+14/-14)
approver/approver.h (+2/-2)
libtelephonyservice/ringtone.cpp (+4/-4)
libtelephonyservice/ringtone.h (+1/-1)
To merge this branch: bzr merge lp:~phablet-team/telephony-service/midori-workaround
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+299563@code.launchpad.net

Commit message

Do not use vibrator - midori workaround

Description of the change

Do not use vibrator - midori workaround

To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote :

The vibration crash issue is fixed by https://code.launchpad.net/~vicamo/qtubuntu-sensors/reimplement-haptics-backend/+merge/300839 and https://code.launchpad.net/~vicamo/telephony-service/use-qtfeedbackeffect-stop/+merge/300841

Reply

Unmerged revisions

1200. By Alfonso Sanchez-Beato

Do not use vibrator - midori workaround

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'approver/approver.cpp'
2--- approver/approver.cpp 2016-01-05 17:14:32 +0000
3+++ approver/approver.cpp 2016-07-08 15:09:14 +0000
4@@ -56,7 +56,7 @@
5 #define TELEPHONY_SERVICE_HANDLER TP_QT_IFACE_CLIENT + ".TelephonyServiceHandler"
6
7 Approver::Approver()
8-: Tp::AbstractClientApprover(channelFilters()),
9+ : Tp::AbstractClientApprover(channelFilters()),
10 mPendingSnapDecision(NULL),
11 mSettleTimer(new QTimer(this))
12 {
13@@ -85,8 +85,8 @@
14 this, SLOT(onUnityStateChanged(int,int)));
15
16 // WORKAROUND: we need to use a timer as the qtubuntu sensors backend does not support setPeriod()
17- mVibrateTimer.setInterval(4000);
18- connect(&mVibrateTimer, SIGNAL(timeout()), &mVibrateEffect, SLOT(start()));
19+ //mVibrateTimer.setInterval(4000);
20+ //connect(&mVibrateTimer, SIGNAL(timeout()), &mVibrateEffect, SLOT(start()));
21
22 mRejectActions["rejectMessage1"] = C::gettext("I'm busy at the moment. I'll call later.");
23 mRejectActions["rejectMessage2"] = C::gettext("I'm running late, on my way now.");
24@@ -114,9 +114,9 @@
25 // reason == 2 is power key
26 if (state == 0 && reason == 2) {
27 Ringtone::instance()->stopIncomingCallSound();
28- mVibrateTimer.stop();
29- mVibrateEffect.setDuration(1);
30- mVibrateEffect.start();
31+ //mVibrateTimer.stop();
32+ //mVibrateEffect.setDuration(1);
33+ //mVibrateEffect.start();
34 }
35 }
36
37@@ -578,11 +578,11 @@
38 Ringtone::instance()->playIncomingCallSound();
39 }
40
41- if (!hasCalls && GreeterContacts::instance()->incomingCallVibrate()) {
42- mVibrateEffect.setDuration(2000);
43- mVibrateEffect.start();
44- mVibrateTimer.start();
45- }
46+ //if (!hasCalls && GreeterContacts::instance()->incomingCallVibrate()) {
47+ //mVibrateEffect.setDuration(2000);
48+ //mVibrateEffect.start();
49+ //mVibrateTimer.start();
50+ //}
51
52 return true;
53 }
54@@ -728,11 +728,11 @@
55
56 Ringtone::instance()->stopIncomingCallSound();
57 ToneGenerator::instance()->stopWaitingTone();
58- mVibrateTimer.stop();
59+ //mVibrateTimer.stop();
60 // WORKAROUND: the ubuntu qt sensors backend does not support setPeriod() and stop(),
61 // so we invoke a short vibration to simulate a stop() call
62- mVibrateEffect.setDuration(1);
63- mVibrateEffect.start();
64+ //mVibrateEffect.setDuration(1);
65+ //mVibrateEffect.start();
66 }
67
68 void Approver::onHangupAndAcceptCallRequested()
69
70=== modified file 'approver/approver.h'
71--- approver/approver.h 2015-07-22 20:40:40 +0000
72+++ approver/approver.h 2016-07-08 15:09:14 +0000
73@@ -85,8 +85,8 @@
74 QString mDefaultTitle;
75 QString mDefaultIcon;
76 QString mCachedBody;
77- QFeedbackHapticsEffect mVibrateEffect;
78- QTimer mVibrateTimer;
79+ //QFeedbackHapticsEffect mVibrateEffect;
80+ //QTimer mVibrateTimer;
81 QTimer *mSettleTimer;
82 QMap<QString,QString> mRejectActions;
83 };
84
85=== modified file 'libtelephonyservice/ringtone.cpp'
86--- libtelephonyservice/ringtone.cpp 2016-03-21 19:05:02 +0000
87+++ libtelephonyservice/ringtone.cpp 2016-07-08 15:09:14 +0000
88@@ -105,7 +105,7 @@
89 mWorker = new RingtoneWorker();
90 mWorker->moveToThread(&mThread);
91 mThread.start();
92- mVibrateEffect.setDuration(500);
93+ //mVibrateEffect.setDuration(500);
94 }
95
96 Ringtone::~Ringtone()
97@@ -132,9 +132,9 @@
98
99 void Ringtone::playIncomingMessageSound()
100 {
101- if (GreeterContacts::instance()->incomingMessageVibrate()) {
102- mVibrateEffect.start();
103- }
104+ //if (GreeterContacts::instance()->incomingMessageVibrate()) {
105+ //mVibrateEffect.start();
106+ //}
107
108 QMetaObject::invokeMethod(mWorker, "playIncomingMessageSound", Qt::QueuedConnection);
109 }
110
111=== modified file 'libtelephonyservice/ringtone.h'
112--- libtelephonyservice/ringtone.h 2015-05-15 20:27:54 +0000
113+++ libtelephonyservice/ringtone.h 2016-07-08 15:09:14 +0000
114@@ -70,7 +70,7 @@
115
116 private:
117 explicit Ringtone(QObject *parent = 0);
118- QFeedbackHapticsEffect mVibrateEffect;
119+ //QFeedbackHapticsEffect mVibrateEffect;
120 RingtoneWorker *mWorker;
121 QThread mThread;
122 };

Subscribers

People subscribed via source and target branches

to all changes: