OSDN Git Service

android-x86/hardware-ril.git
9 years agoFix comment for RIL_SIM_IO_Response in ril.h
Amit Mahajan [Wed, 6 Aug 2014 17:03:15 +0000 (10:03 -0700)]
Fix comment for RIL_SIM_IO_Response in ril.h

Change-Id: Id4ebf5f40dda3e3751146b97cefd42cd15d43e75

9 years agoam 6c607594: Fix crash by checking for NULL token at the beginning of RIL_onRequestCo...
Jayachandran C [Mon, 4 Aug 2014 23:41:07 +0000 (23:41 +0000)]
am 6c607594: Fix crash by checking for NULL token at the beginning of RIL_onRequestComplete

* commit '6c6075946589d61d3bc051dd1986d0bbf0c88da7':
  Fix crash by checking for NULL token at the beginning of RIL_onRequestComplete

9 years agoFix crash by checking for NULL token at the beginning of RIL_onRequestComplete
Jayachandran C [Mon, 4 Aug 2014 22:48:01 +0000 (15:48 -0700)]
Fix crash by checking for NULL token at the beginning of RIL_onRequestComplete

 - RILD crashes when token is NULL because no NULL check at the beginning

9 years agoam 52500160: Change to parse DATA_CALL_LIST correctly based on version.
Amit Mahajan [Wed, 30 Jul 2014 22:19:41 +0000 (22:19 +0000)]
am 52500160: Change to parse DATA_CALL_LIST correctly based on version.

* commit '52500160ca3efd2e7e90df27be0eaded16185642':
  Change to parse DATA_CALL_LIST correctly based on version.

9 years agoChange to parse DATA_CALL_LIST correctly based on version.
Amit Mahajan [Wed, 30 Jul 2014 00:36:48 +0000 (17:36 -0700)]
Change to parse DATA_CALL_LIST correctly based on version.

Bug: 16242255
Change-Id: I9c6dfb41f074da9558f721ca0432f40edc2d4d22

9 years agoam eb2a9345: Merge "Link to the corresponding libril-reference.so on 64 bit platform"
Elliott Hughes [Wed, 23 Jul 2014 02:39:01 +0000 (02:39 +0000)]
am eb2a9345: Merge "Link to the corresponding libril-reference.so on 64 bit platform"

* commit 'eb2a93458204a928edfe36f043ddb48cf5575143':
  Link to the corresponding libril-reference.so on 64 bit platform

9 years agoMerge "Link to the corresponding libril-reference.so on 64 bit platform"
Elliott Hughes [Wed, 23 Jul 2014 02:31:12 +0000 (02:31 +0000)]
Merge "Link to the corresponding libril-reference.so on 64 bit platform"

9 years agoLink to the corresponding libril-reference.so on 64 bit platform
Jun Tian [Tue, 22 Jul 2014 01:58:49 +0000 (09:58 +0800)]
Link to the corresponding libril-reference.so on 64 bit platform

The REFERENCE_RIL_PATH should point to the corresponding path.
Linked to 32 bit library on 64 bit platfrom caused the ril-daemon
crashes, which also blocked the network on emulator image.

Change-Id: I3a928178a2f0fe71b9782cb600b88c6da973826a

9 years agoam 5d0cb9ee: Always #include <sys/...>, not <linux/...>.
Elliott Hughes [Sun, 20 Jul 2014 18:02:19 +0000 (18:02 +0000)]
am 5d0cb9ee: Always #include <sys/...>, not <linux/...>.

* commit '5d0cb9ee42b4f192b039dd6b6c58dcb40c830a14':
  Always #include <sys/...>, not <linux/...>.

9 years agoAlways #include <sys/...>, not <linux/...>.
Elliott Hughes [Sat, 19 Jul 2014 00:55:52 +0000 (17:55 -0700)]
Always #include <sys/...>, not <linux/...>.

(cherry picked from commit 817721ac4c3f843e1f1e973ca3140c61701a511a)

Change-Id: Ie8801e15996ebea16bf70a98c73e4e70fb3a3340

9 years agoam 1d6bf5d7: Merge "Always #include <sys/...>, not <linux/...>."
Elliott Hughes [Sat, 19 Jul 2014 01:04:42 +0000 (01:04 +0000)]
am 1d6bf5d7: Merge "Always #include <sys/...>, not <linux/...>."

* commit '1d6bf5d7729fcd476aab218c8eec29adffef3d35':
  Always #include <sys/...>, not <linux/...>.

9 years agoChanges to correctly process EAP-SIM req parameters in ril
Amit Mahajan [Tue, 1 Jul 2014 22:54:08 +0000 (15:54 -0700)]
Changes to correctly process EAP-SIM req parameters in ril

Change-Id: I393c18f878fe3e5efcd81543a9a38a4c353b6e03

9 years agoMerge "Always #include <sys/...>, not <linux/...>."
Elliott Hughes [Sat, 19 Jul 2014 00:56:24 +0000 (00:56 +0000)]
Merge "Always #include <sys/...>, not <linux/...>."

9 years agoAlways #include <sys/...>, not <linux/...>.
Elliott Hughes [Sat, 19 Jul 2014 00:55:52 +0000 (17:55 -0700)]
Always #include <sys/...>, not <linux/...>.

Change-Id: Id6e846ff01bebf65828da78ae673233bcaeb3d40

9 years agoAdd switch case for '-c' in reference-ril
Sandeep Gutta [Wed, 9 Jul 2014 23:30:25 +0000 (05:00 +0530)]
Add switch case for '-c' in reference-ril

Currently reference-ril not handling the '-c' option
that RILD is sending as part of "RIL_Init" arguments and
due to that reference-ril initialisation failing for emulator.

To fix this add switch case statement to handle '-c' option.

Change-Id: Ia2430cb1df91b42d51af7bf820ff42b8ce2b5066

9 years agoAdd support for retrieving real time data connection information.
Wink Saville [Sun, 13 Jul 2014 12:17:28 +0000 (05:17 -0700)]
Add support for retrieving real time data connection information.

To be able to reduce power consumption caused by the mobile radio being
in a high power state, the radio will report its power state in real
time.

Bug: 8233234
Change-Id: Ia4195211c380efc04a65c6f1f6e4d29095a1bc35

9 years agoEAP-SIM RIL command name change.
Amit Mahajan [Thu, 26 Jun 2014 21:20:11 +0000 (14:20 -0700)]
EAP-SIM RIL command name change.

Modified the name to match what was in QCRIL.
Added structures for req/resp in ril.h

Change-Id: I41abfacb7bacd4cfa0d4543100ac9960c97184f9

9 years agoMerge kwd to master
Etan Cohen [Fri, 20 Jun 2014 15:28:44 +0000 (08:28 -0700)]
Merge kwd to master

Change-Id: Id33008507cbafc88288b6483c7691d6db34cc5c3

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Thu, 22 May 2014 14:22:11 +0000 (07:22 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Thu, 22 May 2014 12:50:33 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Wed, 21 May 2014 12:50:27 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Tue, 20 May 2014 12:50:19 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Mon, 19 May 2014 12:49:58 +0000 (05:49 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sun, 18 May 2014 12:49:58 +0000 (05:49 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sat, 17 May 2014 12:51:11 +0000 (05:51 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Thu, 15 May 2014 12:50:57 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Wed, 14 May 2014 12:50:56 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Tue, 13 May 2014 12:50:33 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Mon, 12 May 2014 12:49:50 +0000 (05:49 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sun, 11 May 2014 12:49:55 +0000 (05:49 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agomerge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sat, 10 May 2014 12:50:41 +0000 (05:50 -0700)]
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996

9 years agoam 16d99d6d: am f3a5fb23: am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 18:24:00 +0000 (18:24 +0000)]
am 16d99d6d: am f3a5fb23: am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."

* commit '16d99d6d5334b5079732c651eaf1cb434084862f':
  Remove unused LOCAL_LDLIBS.

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Thu, 8 May 2014 12:50:37 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agoam f3a5fb23: am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 23:01:12 +0000 (23:01 +0000)]
am f3a5fb23: am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."

* commit 'f3a5fb23a77e942a154d357299a84e5b14863b0c':
  Remove unused LOCAL_LDLIBS.

10 years agoam 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:54:24 +0000 (22:54 +0000)]
am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."

* commit '8e7ff420ca742d050ebac3f1956055ed97e429ff':
  Remove unused LOCAL_LDLIBS.

10 years agoMerge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:49:54 +0000 (22:49 +0000)]
Merge "Remove unused LOCAL_LDLIBS."

10 years agoRemove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:30:50 +0000 (15:30 -0700)]
Remove unused LOCAL_LDLIBS.

Change-Id: Id93e486c16cfce8be120a136ff798631e540c89e

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Wed, 7 May 2014 16:11:17 +0000 (09:11 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Wed, 7 May 2014 12:50:30 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Tue, 6 May 2014 12:50:31 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Mon, 5 May 2014 12:50:01 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Sun, 4 May 2014 12:49:53 +0000 (05:49 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Sat, 3 May 2014 12:50:58 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Thu, 1 May 2014 12:50:32 +0000 (05:50 -0700)]
merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Wed, 30 Apr 2014 12:50:51 +0000 (05:50 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agoam 85f68ea0: am aa7bcefc: Merge commit \'f884b7a14aebd9804c259b40f2aff7d69acf2ea9...
Bill Yi [Wed, 30 Apr 2014 12:50:30 +0000 (12:50 +0000)]
am 85f68ea0: am aa7bcefc: Merge commit \'f884b7a14aebd9804c259b40f2aff7d69acf2ea9\' into HEAD

* commit '85f68ea05e32bd869d14dca07b3a72f2c1ea91b8':

10 years agoam aa7bcefc: Merge commit \'f884b7a14aebd9804c259b40f2aff7d69acf2ea9\' into HEAD
Bill Yi [Wed, 30 Apr 2014 00:59:12 +0000 (00:59 +0000)]
am aa7bcefc: Merge commit \'f884b7a14aebd9804c259b40f2aff7d69acf2ea9\' into HEAD

* commit 'aa7bcefcd3784e43ca197f003db101763b739ed6':

10 years agoMerge commit 'f884b7a14aebd9804c259b40f2aff7d69acf2ea9' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:34:22 +0000 (11:34 -0700)]
Merge commit 'f884b7a14aebd9804c259b40f2aff7d69acf2ea9' into HEAD

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Tue, 29 Apr 2014 12:50:35 +0000 (05:50 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Mon, 28 Apr 2014 12:49:48 +0000 (05:49 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Sun, 27 Apr 2014 12:49:51 +0000 (05:49 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Sat, 26 Apr 2014 12:51:19 +0000 (05:51 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agomerge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Thu, 24 Apr 2014 12:51:50 +0000 (05:51 -0700)]
merge in master-release history after reset to b8805e75ef4b4a014e7a42158018a79f87cce654

10 years agomerge in master-release history after reset to master
The Android Automerger [Sat, 19 Apr 2014 12:50:29 +0000 (05:50 -0700)]
merge in master-release history after reset to master

10 years agoam 02a2bf2c: am e145607b: Merge "rild: Fix a sizeof bug."
Mohamad Ayyash [Fri, 18 Apr 2014 21:18:40 +0000 (21:18 +0000)]
am 02a2bf2c: am e145607b: Merge "rild: Fix a sizeof bug."

* commit '02a2bf2c86e129d23137635935b197c4d2b95299':
  rild: Fix a sizeof bug.

10 years agoam e145607b: Merge "rild: Fix a sizeof bug."
Mohamad Ayyash [Fri, 18 Apr 2014 21:15:32 +0000 (21:15 +0000)]
am e145607b: Merge "rild: Fix a sizeof bug."

* commit 'e145607bb74c037dbe38b6351f2457ea23ee3160':
  rild: Fix a sizeof bug.

10 years agoMerge "rild: Fix a sizeof bug."
Mohamad Ayyash [Fri, 18 Apr 2014 18:49:49 +0000 (18:49 +0000)]
Merge "rild: Fix a sizeof bug."

10 years agorild: Fix a sizeof bug.
Mohamad Ayyash [Fri, 18 Apr 2014 18:43:28 +0000 (11:43 -0700)]
rild: Fix a sizeof bug.

Change-Id: Ic207f8b1567849051f24342e37f905a59b43dad2

10 years agorild: Fix a sizeof bug.
Mohamad Ayyash [Fri, 18 Apr 2014 18:43:28 +0000 (11:43 -0700)]
rild: Fix a sizeof bug.

Change-Id: Ic207f8b1567849051f24342e37f905a59b43dad2

10 years agoam c6bb9727: Merge "[RIL] 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 15:54:51 +0000 (15:54 +0000)]
am c6bb9727: Merge "[RIL] 64-bit compile issues"

* commit 'c6bb97274337f55fec2e7f33aec7acc9de117ddf':
  [RIL] 64-bit compile issues

10 years agomerge in master-release history after reset to master
The Android Automerger [Thu, 13 Mar 2014 12:50:40 +0000 (05:50 -0700)]
merge in master-release history after reset to master

10 years agoam 1a206079: am c6bb9727: Merge "[RIL] 64-bit compile issues"
Mark Salyzyn [Wed, 12 Mar 2014 23:37:18 +0000 (23:37 +0000)]
am 1a206079: am c6bb9727: Merge "[RIL] 64-bit compile issues"

* commit '1a2060792f2a867422b51c0e4d352d8d3804e613':
  [RIL] 64-bit compile issues

10 years agoam c6bb9727: Merge "[RIL] 64-bit compile issues"
Mark Salyzyn [Wed, 12 Mar 2014 23:29:08 +0000 (23:29 +0000)]
am c6bb9727: Merge "[RIL] 64-bit compile issues"

* commit 'c6bb97274337f55fec2e7f33aec7acc9de117ddf':
  [RIL] 64-bit compile issues

10 years agoMerge "[RIL] 64-bit compile issues"
Mark Salyzyn [Wed, 12 Mar 2014 23:19:43 +0000 (23:19 +0000)]
Merge "[RIL] 64-bit compile issues"

10 years ago[RIL] 64-bit compile issues
Mark Salyzyn [Wed, 12 Mar 2014 22:20:22 +0000 (15:20 -0700)]
[RIL] 64-bit compile issues

- size_t use %zu format
- All in RLOG, so zero functional impact
- suppress unused argument warnings

Change-Id: I99d7221a13de6f12bfcf93ef8fe4521669f1f783

10 years agoam 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
Etan Cohen [Tue, 11 Mar 2014 18:17:11 +0000 (18:17 +0000)]
am 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"

* commit '458d8b7e11c39e550106f50866103936530a6e11':
  [RIL] Fix build-break when enabling RILC_LOG

10 years agoam ebdf40e6: Merge "reference-ril: fix LP64 warnings"
Colin Cross [Fri, 7 Mar 2014 02:23:47 +0000 (02:23 +0000)]
am ebdf40e6: Merge "reference-ril: fix LP64 warnings"

* commit 'ebdf40e65a17e8758c059a736425cd47563cdace':
  reference-ril: fix LP64 warnings

10 years agomerge in master-release history after reset to master
The Android Automerger [Sat, 1 Mar 2014 13:50:48 +0000 (05:50 -0800)]
merge in master-release history after reset to master

10 years agoam 680bdfa7: am 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
Etan Cohen [Fri, 28 Feb 2014 19:35:26 +0000 (19:35 +0000)]
am 680bdfa7: am 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"

* commit '680bdfa726292c466f4cf68363b29f8781c3fb63':
  [RIL] Fix build-break when enabling RILC_LOG

10 years agoam 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
Etan Cohen [Fri, 28 Feb 2014 19:27:58 +0000 (19:27 +0000)]
am 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"

* commit '458d8b7e11c39e550106f50866103936530a6e11':
  [RIL] Fix build-break when enabling RILC_LOG

10 years agoMerge "[RIL] Fix build-break when enabling RILC_LOG"
Etan Cohen [Fri, 28 Feb 2014 19:23:46 +0000 (19:23 +0000)]
Merge "[RIL] Fix build-break when enabling RILC_LOG"

10 years ago[RIL] Fix build-break when enabling RILC_LOG
Etan Cohen [Fri, 28 Feb 2014 01:25:17 +0000 (17:25 -0800)]
[RIL] Fix build-break when enabling RILC_LOG

A couple of debug messages were using out-of-date struct
members causing the build to break when the RILC_LOG flag
was enabled.

Change-Id: I258a58744aa3c71ddbe09e598221c149be59b554

10 years agoRemove unneeded new RIL command.
Jake Hamby [Thu, 6 Feb 2014 22:52:05 +0000 (14:52 -0800)]
Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.

Bug: 12864208
Change-Id: I0831b8495d06065e96239ef74d67342daa7b3743

10 years agoRemove unneeded new RIL command.
Jake Hamby [Thu, 6 Feb 2014 22:52:05 +0000 (14:52 -0800)]
Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.

Bug: 12864208
Change-Id: I0831b8495d06065e96239ef74d67342daa7b3743

10 years agoam 221b96c9: am ebdf40e6: Merge "reference-ril: fix LP64 warnings"
Colin Cross [Thu, 6 Feb 2014 07:51:30 +0000 (07:51 +0000)]
am 221b96c9: am ebdf40e6: Merge "reference-ril: fix LP64 warnings"

* commit '221b96c92083a624659b8f2c17bcd61eb04b3f98':
  reference-ril: fix LP64 warnings

10 years agoam ebdf40e6: Merge "reference-ril: fix LP64 warnings"
Colin Cross [Thu, 6 Feb 2014 07:42:04 +0000 (07:42 +0000)]
am ebdf40e6: Merge "reference-ril: fix LP64 warnings"

* commit 'ebdf40e65a17e8758c059a736425cd47563cdace':
  reference-ril: fix LP64 warnings

10 years agoMerge "reference-ril: fix LP64 warnings"
Colin Cross [Thu, 6 Feb 2014 07:33:19 +0000 (07:33 +0000)]
Merge "reference-ril: fix LP64 warnings"

10 years agoreference-ril: fix LP64 warnings
Colin Cross [Thu, 6 Feb 2014 02:55:42 +0000 (18:55 -0800)]
reference-ril: fix LP64 warnings

Use %p to print pointers

Change-Id: I5ad8e349a0dc0b471eb693f87b088edb555a48a7

10 years agoAdd new RIL commands to read, write, and reset NV items.
Jake Hamby [Wed, 15 Jan 2014 21:12:05 +0000 (13:12 -0800)]
Add new RIL commands to read, write, and reset NV items.

Add new RIL commands to read, write, and reset NV items,
including the CDMA Preferred Roaming List (PRL).

Used for device configuration by some CDMA operators.

Bug: 12864208
Change-Id: I792e272438b56bca725e6c034baac19244e5563f

10 years agoam eacd3caa: am 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELA...
Colin Cross [Sat, 25 Jan 2014 05:56:33 +0000 (05:56 +0000)]
am eacd3caa: am 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"

* commit 'eacd3caa7a8fc01cedbe82fafd87be131ad231a8':
  Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE

10 years agoam 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"
Colin Cross [Sat, 25 Jan 2014 05:16:43 +0000 (21:16 -0800)]
am 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"

* commit '2f29fdb8a8cb7f624801d35ab108f0321030c61b':
  Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE

10 years agoMerge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"
Colin Cross [Sat, 25 Jan 2014 05:11:12 +0000 (05:11 +0000)]
Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"

10 years agoSet USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
Colin Cross [Sat, 25 Jan 2014 01:02:19 +0000 (17:02 -0800)]
Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE

64 bit bionic does not define pthread_cond_timeout_np, use
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE to determine whether or
not to use it.

Change-Id: Ia94dd76f7ea4b0268f07049c127342a8bd016ec0

10 years agoam cc1983a7: am dcb3334c: Merge "Fix pthread_create error handling in ril harder."
Elliott Hughes [Mon, 6 Jan 2014 22:01:58 +0000 (22:01 +0000)]
am cc1983a7: am dcb3334c: Merge "Fix pthread_create error handling in ril harder."

* commit 'cc1983a73ada8546905d6174b0d694b88f5f1916':
  Fix pthread_create error handling in ril harder.

10 years agoam dcb3334c: Merge "Fix pthread_create error handling in ril harder."
Elliott Hughes [Mon, 6 Jan 2014 21:53:08 +0000 (13:53 -0800)]
am dcb3334c: Merge "Fix pthread_create error handling in ril harder."

* commit 'dcb3334ce57f28a525d7e86222d4c7c6e3907ba3':
  Fix pthread_create error handling in ril harder.

10 years agoMerge "Fix pthread_create error handling in ril harder."
Elliott Hughes [Mon, 6 Jan 2014 21:49:08 +0000 (21:49 +0000)]
Merge "Fix pthread_create error handling in ril harder."

10 years agoam 091ed337: am 21538d94: Merge "Fix pthread_create error handling in ril."
Elliott Hughes [Mon, 6 Jan 2014 20:56:51 +0000 (20:56 +0000)]
am 091ed337: am 21538d94: Merge "Fix pthread_create error handling in ril."

* commit '091ed337b14b6e5bcf35286d8ca5a3457cafa7ce':
  Fix pthread_create error handling in ril.

10 years agoam 21538d94: Merge "Fix pthread_create error handling in ril."
Elliott Hughes [Mon, 6 Jan 2014 20:48:47 +0000 (12:48 -0800)]
am 21538d94: Merge "Fix pthread_create error handling in ril."

* commit '21538d9410d3d04cc15f08a3a25b5f2501a70f9e':
  Fix pthread_create error handling in ril.

10 years agoFix pthread_create error handling in ril harder.
Elliott Hughes [Mon, 6 Jan 2014 20:46:02 +0000 (12:46 -0800)]
Fix pthread_create error handling in ril harder.

The previous patch fixed the behavior _if_ something goes wrong...
...but didn't fix the check for whether something went wrong.
pthread_create isn't a regular Unix "return -1 and set errno" kind
of function; it returns 0 on success and an error number (without
setting errno) on failure.

Bug: https://code.google.com/p/android/issues/detail?id=64189
Change-Id: I335af890885d6a672d7bac746fdfea3ed3995360

10 years agoMerge "Fix pthread_create error handling in ril."
Elliott Hughes [Mon, 6 Jan 2014 20:44:05 +0000 (20:44 +0000)]
Merge "Fix pthread_create error handling in ril."

10 years agoFix pthread_create error handling in ril.
Elliott Hughes [Fri, 3 Jan 2014 23:31:42 +0000 (15:31 -0800)]
Fix pthread_create error handling in ril.

Bug: https://code.google.com/p/android/issues/detail?id=64189
Change-Id: Ie6282dda582a574aaad5513c39f2d8d965f6dee3

10 years agoam 05eb2d71: am c4801e78: Merge "Fix parameter mismatch between header and implementa...
Wink Saville [Mon, 16 Dec 2013 20:39:01 +0000 (20:39 +0000)]
am 05eb2d71: am c4801e78: Merge "Fix parameter mismatch between header and implementation"

* commit '05eb2d71de4caa1226b4b4898414042abfd9d539':
  Fix parameter mismatch between header and implementation

10 years agoam c4801e78: Merge "Fix parameter mismatch between header and implementation"
Wink Saville [Mon, 16 Dec 2013 20:32:32 +0000 (12:32 -0800)]
am c4801e78: Merge "Fix parameter mismatch between header and implementation"

* commit 'c4801e78cc7b75a744a45a2a855503daca5bf0f3':
  Fix parameter mismatch between header and implementation

10 years agoMerge "Fix parameter mismatch between header and implementation"
Wink Saville [Mon, 16 Dec 2013 20:26:32 +0000 (20:26 +0000)]
Merge "Fix parameter mismatch between header and implementation"

10 years agoam 169e3195: am af03f928: Merge "Removing the error return value requirement for...
Wink Saville [Mon, 16 Dec 2013 19:58:46 +0000 (19:58 +0000)]
am 169e3195: am af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit '169e3195c45cc50ed315a2a48aa80a58818303da':
  Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.

10 years agoam af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_O...
Wink Saville [Mon, 16 Dec 2013 19:53:12 +0000 (11:53 -0800)]
am af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit 'af03f9284c7e775df8feeef6eb96ffb039949e9a':
  Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.

10 years agoMerge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."
Wink Saville [Mon, 16 Dec 2013 19:48:14 +0000 (19:48 +0000)]
Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

10 years agoRemoving the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
Shishir Agrawal [Mon, 16 Dec 2013 18:10:01 +0000 (10:10 -0800)]
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.

On error, the RIL implementation should throw an error and the value returned
does not need to be valid.

Change-Id: Idf81e6f7e2aa5e967e97cef402dfd53150b9b183

10 years agoam bd7603d8: am 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL...
Wink Saville [Fri, 13 Dec 2013 22:57:23 +0000 (22:57 +0000)]
am bd7603d8: am 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit 'bd7603d8fcb16d039dff2d4e8035a2b5fa73460a':
  Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.

10 years agoam 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicate...
Wink Saville [Fri, 13 Dec 2013 19:59:19 +0000 (11:59 -0800)]
am 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit '710f0c82afb8d1660539b74d7f4c137b0644b799':
  Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.