← Back to branch summary

~phablet-team/ofono/midori-support

« back to all changes in this revision

Viewing changes to plugins/ril.c

  • Committer: Alfonso Sanchez-Beato
  • Date: 2015-09-28 08:10:59 UTC
  • mfrom: (6830.1.168)
  • mto: This revision was merged to the branch mainline in revision 6904.
  • Revision ID: alfonso.sanchez-beato@canonical.com-20150928081059-1o08e2a9pkit6ar6
* Update to upstream release 1.17
* Do not assert when the radio is unavailable (LP: #1490991)
* Fix crash when importing phonebook (LP: #1486004)
* Check only destination port when receiving push (LP: #1490673)
* Fix crash when retrying to close context (LP: #1492483)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/ril.c
29
29
#include <errno.h>
30
30
#include <stdlib.h>
31
31
#include <string.h>
 
32
 
 
33
#include <unistd.h>
32
34
#include <glib.h>
33
35
 
34
36
#define OFONO_API_SUBJECT_TO_CHANGE
134
136
                case RADIO_STATE_OFF:
135
137
 
136
138
                        /*
137
 
                         * If radio powers off asychronously, then
138
 
                         * assert, and let upstart re-start the stack.
 
139
                         * Unexpected radio state change, as we are supposed to
 
140
                         * be online. UNAVAILABLE has been seen occassionally
 
141
                         * when powering off the phone. We wait 5 secs to avoid
 
142
                         * too fast re-spawns, then exit with error to make
 
143
                         * upstart re-start ofono.
139
144
                         */
140
145
                        if (rd->ofono_online) {
141
146
                                ofono_error("%s: radio self-powered off!",
142
147
                                                __func__);
143
 
                                g_assert(FALSE);
 
148
                                sleep(5);
 
149
                                exit(1);
144
150
                        }
145
151
                        break;
146
152
                default: