git.osdn.net Git - android-x86/hardware-ril.git/log

Nathan Harold [Thu, 13 Oct 2016 02:14:48 +0000 (02:14 +0000)]

Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO am: c863521147
am: 500e1720eb

Change-Id: I87501c890b709dbaca71e941a1c751e9345db4f3

commit | commitdiff | tree

Nathan Harold [Thu, 13 Oct 2016 02:07:47 +0000 (02:07 +0000)]

Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO
am: c863521147

Change-Id: I01b10273285311173766966878d8174cda8e6bf8

commit | commitdiff | tree

Nathan Harold [Mon, 10 Oct 2016 18:15:21 +0000 (11:15 -0700)]

Update documentation to clarify RIL_REQUEST_GET_ACTIVITY_INFO

The documentation for RIL_REQUEST_GET_ACTIVITY_INFO allowed for
critically disruptive behavior in the implementation of the API.
This is a documentation update to ensure that there will be
exactly one power state reported in each millisecond, which
is important for proper power accounting in FDD.

Bug: 32061813
Test: none
Change-Id: I2835d5ad298eaa8cfea2e1a90342f290183f698d

commit | commitdiff | tree

Sanket Padawe [Fri, 23 Sep 2016 17:32:54 +0000 (17:32 +0000)]

Merge "Fix memory leak in requestSendSMS" am: 07b1732d84 am: 3fbcb63219
am: 2ea3dd7197

Change-Id: Ief8d067872534de91c81248594d83386497b3f02

commit | commitdiff | tree

Sanket Padawe [Fri, 23 Sep 2016 17:31:24 +0000 (17:31 +0000)]

Merge "Fix memory leak in requestSendSMS" am: 07b1732d84
am: 3fbcb63219

Change-Id: I791f6ec0ebcf85563559e5ad900c4ce512d03044

commit | commitdiff | tree

Sanket Padawe [Fri, 23 Sep 2016 17:28:56 +0000 (17:28 +0000)]

Merge "Fix memory leak in requestSendSMS"
am: 07b1732d84

Change-Id: I2f5fe58627d8e5a83fd54b9cb967ba7b39d13376

commit | commitdiff | tree

Sanket Padawe [Fri, 23 Sep 2016 17:26:03 +0000 (17:26 +0000)]

Merge "Fix memory leak in requestSendSMS"

commit | commitdiff | tree

Sanket Padawe [Thu, 1 Sep 2016 03:43:12 +0000 (03:43 +0000)]

Merge "Fix RIL_CardStatus_v5 Parceling." am: 164a2c7ff1 am: c5d7058a68
am: 4ffea6f651

Change-Id: Ied193468bd9133d7b9ed710af82c33b9fc3b7e01

commit | commitdiff | tree

Sanket Padawe [Thu, 1 Sep 2016 03:20:14 +0000 (03:20 +0000)]

Merge "Fix RIL_CardStatus_v5 Parceling." am: 164a2c7ff1
am: c5d7058a68

Change-Id: I00c834069a9b2be0629495bad6580984c8d0273d

commit | commitdiff | tree

Sanket Padawe [Thu, 1 Sep 2016 03:17:45 +0000 (03:17 +0000)]

Merge "Fix RIL_CardStatus_v5 Parceling."
am: 164a2c7ff1

Change-Id: I27e70a5a97deb11ad3dea1bd49c0ac092c291950

commit | commitdiff | tree

Sanket Padawe [Thu, 1 Sep 2016 02:57:56 +0000 (02:57 +0000)]

Merge "Fix RIL_CardStatus_v5 Parceling."

commit | commitdiff | tree

Kyle Repinski [Wed, 31 Aug 2016 06:04:02 +0000 (01:04 -0500)]

Fix RIL_CardStatus_v5 Parceling.

The difference between a v5 and v6 CardStatus response is the addition
of ims_subscription_app_index. In previous releases libril added a -1
to the Parcel in its place for transparent handling of GET_SIM_STATUS
everywhere else regardless of v5 or v6 responses, but it was erroneously
removed in change I4e53c6125995064b8ac0cdfc9376ef2cefe69ec8

Change-Id: I078b61d2f6dc28f738e8eb87f51193fa0bd94c7d

commit | commitdiff | tree

Amit Mahajan [Wed, 17 Aug 2016 19:03:27 +0000 (19:03 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe am: 30be8a250b am: 9df4b4f002 am: 3731ea7548
am: 22b41817f8

Change-Id: Icec9b66c251619dd47a4302af058d3e76f019b09

commit | commitdiff | tree

Amit Mahajan [Wed, 17 Aug 2016 19:03:26 +0000 (19:03 +0000)]

Replace variable-length arrays on stack with malloc. am: 49db26c574
am: 914650eb02

Change-Id: I9b6439bc29d52871081ef836c1104e80644eb76b

commit | commitdiff | tree

Amit Mahajan [Wed, 17 Aug 2016 18:09:56 +0000 (18:09 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe am: 30be8a250b am: 9df4b4f002
am: 3731ea7548

Change-Id: I2979e5bcf5e46ead97bb0fa589431ad9e6f75618

commit | commitdiff | tree

Amit Mahajan [Wed, 17 Aug 2016 18:09:54 +0000 (18:09 +0000)]

Replace variable-length arrays on stack with malloc.
am: 49db26c574

Change-Id: I1932691bfdba50fd4d9ba77505d03866ff312372

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:17:13 +0000 (23:17 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe am: 30be8a250b am: 9df4b4f002
am: 3f56be6062

Change-Id: I9d2d4f4fb1039fe505c9c2e76b9a57a8801242c3

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:17:12 +0000 (23:17 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe am: 30be8a250b
am: 9df4b4f002

Change-Id: I42abe5d593acd1014b42a8f97273f706009b16d2

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:14:44 +0000 (23:14 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe am: 30be8a250b
am: 9df4b4f002

Change-Id: I8e586e654727e3f87f1efc28edf5572b3f971e10

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:12:41 +0000 (23:12 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a am: bf678da1fe
am: 30be8a250b

Change-Id: I5cc0b7e45e5584d2938cf61da8526039911d374a

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:08:11 +0000 (23:08 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f am: 837c8b680a
am: bf678da1fe

Change-Id: I3a574c790342b609ca86286140d4d6c7ed12e1aa

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:04:13 +0000 (23:04 +0000)]

Replace variable-length arrays on stack with malloc. am: 943905bb9f
am: 837c8b680a

Change-Id: Idfd58f5e20c81a5b67d9f581d932c1a3e3cd1fad

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Aug 2016 23:01:39 +0000 (23:01 +0000)]

Replace variable-length arrays on stack with malloc.
am: 943905bb9f

Change-Id: Ie54e7e1a0e255e61b0c5182ec72b0cdb376efbd1

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Aug 2016 16:06:34 +0000 (09:06 -0700)]

Replace variable-length arrays on stack with malloc.

Bug: 30202619
Change-Id: Ib95e08a1c009d88a4b4fd8d8fdba0641c6129008

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Aug 2016 16:06:34 +0000 (09:06 -0700)]

Replace variable-length arrays on stack with malloc.

Bug: 30202619
Change-Id: Ib95e08a1c009d88a4b4fd8d8fdba0641c6129008

commit | commitdiff | tree

Sanket Padawe [Tue, 9 Aug 2016 00:53:01 +0000 (00:53 +0000)]

Fix documentation of RIL_Request in ril.h am: 05c2307a82
am: aee7a26ae5

Change-Id: Id8b2b55a292346df3bd719cf3515c3028a9505cd

commit | commitdiff | tree

Sanket Padawe [Tue, 9 Aug 2016 00:45:10 +0000 (00:45 +0000)]

Fix documentation of RIL_Request in ril.h
am: 05c2307a82

Change-Id: I6f8f6ca3d2d0f023602110ad3840784d8caee42a

commit | commitdiff | tree

Sanket Padawe [Mon, 8 Aug 2016 22:42:17 +0000 (15:42 -0700)]

Fix documentation of RIL_Request in ril.h

Bug: 30380273
Change-Id: If086f5ea6f986a0da0d6f0729c28d913103b01ed

Add comment for RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
am: d5c540fe09

Change-Id: Ifad313a7f5f1926091fd9f042eb8302c8a5bd595

Add comment for RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS

Added modem behavior convention for vendor's reference

Bug: 29409395
Change-Id: Ic7bbf24ca8d62e14353ad4d7ea8f1e5fabaf96f9

commit | commitdiff | tree

Sanket Padawe [Fri, 8 Jul 2016 23:36:16 +0000 (23:36 +0000)]

Fix build warnings in ril.cpp.
am: 65879e8093

Change-Id: I929558165ff54c09fad8fbfe2b4fea1fc721c100

commit | commitdiff | tree

Sanket Padawe [Fri, 8 Jul 2016 21:51:03 +0000 (14:51 -0700)]

Fix build warnings in ril.cpp.

Bug: 29401612
Change-Id: Icba225928f1336785cc5cb9a81e1c5b7b2121353

commit | commitdiff | tree

Sanket Padawe [Fri, 1 Jul 2016 00:08:41 +0000 (17:08 -0700)]

Merge commit 'f0c8ca7f09ed9a827e5c79e019526e8f2c77eeb4' into manual_merge_f0c8ca7

Change-Id: I670c9270d5d6fccd4b1a223de142d61e26541b7e

commit | commitdiff | tree

Sanket Padawe [Thu, 30 Jun 2016 22:01:08 +0000 (15:01 -0700)]

Fix build warnings in hardware/ril.

Bug: 29401612
Change-Id: I8473294655ad24ec001cedb84856004ab0ba22a7

commit | commitdiff | tree

Chih-Hung Hsieh [Wed, 29 Jun 2016 19:47:32 +0000 (19:47 +0000)]

Merge \\\"Fix misc-macro-parentheses warnings in hardware/ril.\\\" am: 1648a3f50b am: 929b0a7e35
am: d335e16728

Change-Id: I18bd42641b83ef439357c9211496aa11c19a2f41

commit | commitdiff | tree

Chih-Hung Hsieh [Wed, 29 Jun 2016 19:44:50 +0000 (19:44 +0000)]

Merge \\"Fix misc-macro-parentheses warnings in hardware/ril.\\" am: 1648a3f50b
am: 929b0a7e35

Change-Id: Ifb4169b780d050fab31f0987dca810cada7307ce

commit | commitdiff | tree

Chih-Hung Hsieh [Wed, 29 Jun 2016 19:42:26 +0000 (19:42 +0000)]

Merge \"Fix misc-macro-parentheses warnings in hardware/ril.\"
am: 1648a3f50b

Change-Id: Ib880298fc4001e0befe10582e9f6e5c792d1bd69

commit | commitdiff | tree

Treehugger Robot [Wed, 29 Jun 2016 19:31:52 +0000 (19:31 +0000)]

Merge "Fix misc-macro-parentheses warnings in hardware/ril."

commit | commitdiff | tree

Chih-Hung Hsieh [Wed, 29 Jun 2016 18:22:36 +0000 (11:22 -0700)]

Fix misc-macro-parentheses warnings in hardware/ril.

Add parentheses around negative literals.
Bug: 28705665
Test: build with clang-tidy

Change-Id: I038c7cbf3728a4e9ccc20d8c7317ddae3fa9b571

Merge \"Fix compile warning in libril.cpp\" into nyc-mr1-dev
am: 4ada88aeb5

Change-Id: Ica2aaca0c7ba313ee3e97d627c10daa702896064

commit | commitdiff | tree

TreeHugger Robot [Mon, 27 Jun 2016 20:54:55 +0000 (20:54 +0000)]

Merge "Fix compile warning in libril.cpp" into nyc-mr1-dev

Add support for LTE CarrierAgregation
am: 6dbb43ca9a

Change-Id: I1f4ffab284b6952b2f196e5ecec74cb6b27a7b1b

commit | commitdiff | tree

David 'Digit' Turner [Thu, 23 Jun 2016 09:15:01 +0000 (11:15 +0200)]

resolve merge conflicts of d027477 to nyc-mr1-dev-plus-aosp

Change-Id: I7d0ddf2cf04ed35b3541b99955561203181367fb

commit | commitdiff | tree

David Turner [Thu, 23 Jun 2016 08:43:13 +0000 (08:43 +0000)]

resolve merge conflicts of ccd27b0 to stage-aosp-master
am: 25d580912d

Change-Id: I7afa0604b98b90256c47e806fbb8e11d9ac98594

commit | commitdiff | tree

David 'Digit' Turner [Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)]

resolve merge conflicts of ccd27b0 to stage-aosp-master

Change-Id: Ic5a6bb461c60646d7f9798cb1bf99110c6592f91

commit | commitdiff | tree

David Turner [Thu, 23 Jun 2016 07:52:29 +0000 (07:52 +0000)]

Merge "Simplify emulator-specific logic."

commit | commitdiff | tree

David 'Digit' Turner [Wed, 22 Jun 2016 10:10:01 +0000 (12:10 +0200)]

Simplify emulator-specific logic.

Remove any qemu-specific code from rild.c, this now handled
by setting rild.libpath properly in the init.<board>.rc files
for emulator-specific build products.

Also, only the qemu pipe method is really supported since ICS
so remove obsolete schemes.

BUG=25875346

Change-Id: I82296c127b90c230ca1446ee2431f06e78def617

Fix compile warning in libril.cpp

Bug: 29401612
Change-Id: Ifb04928fce7f2e028c0f69d6cdbb1dce0befeadf

commit | commitdiff | tree

David 'Digit' Turner [Tue, 21 Jun 2016 08:10:35 +0000 (08:10 +0000)]

Merge \\\"[qemu]: Use new <system/qemu_pipe.h> header.\\\" am: 47a81105da am: c963b671f3
am: 12db6c3cf4

Change-Id: Ie9eb87da94a47d90994294dd1ac2f743bf5cfe54

commit | commitdiff | tree

David Turner [Tue, 21 Jun 2016 08:08:00 +0000 (08:08 +0000)]

Merge \\"[qemu]: Use new <system/qemu_pipe.h> header.\\" am: 47a81105da
am: c963b671f3

Change-Id: Id5a2b977a6867537a51f3f740a7df28aca441a4d

commit | commitdiff | tree

David 'Digit' Turner [Tue, 21 Jun 2016 08:05:15 +0000 (08:05 +0000)]

Merge \"[qemu]: Use new <system/qemu_pipe.h> header.\"
am: 47a81105da

Change-Id: I3d5e17d7c9468321273bf9540548ef12d931c91d

commit | commitdiff | tree

David Turner [Tue, 21 Jun 2016 07:38:01 +0000 (07:38 +0000)]

Merge "[qemu]: Use new <system/qemu_pipe.h> header."

Add support for LTE CarrierAgregation

Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: I36a548b3229bf344ac2e4b714d8dc1dfa47af064

commit | commitdiff | tree

David 'Digit' Turner [Thu, 16 Jun 2016 17:00:05 +0000 (19:00 +0200)]

[qemu]: Use new <system/qemu_pipe.h> header.

BUG=25875346

Change-Id: Ie8649caa43a77a4ea1399df673cce2682773e4df

commit | commitdiff | tree

Robert Greenwalt [Thu, 16 Jun 2016 00:15:19 +0000 (00:15 +0000)]

Merge \"Move struct def out of an #ifdef\" into nyc-mr1-dev
am: a976a8221f

Change-Id: I415eb2ea039d2c147ced33fa2c21d5bde1c09b82

commit | commitdiff | tree

Robert Greenwalt [Thu, 16 Jun 2016 00:08:06 +0000 (00:08 +0000)]

Merge "Move struct def out of an #ifdef" into nyc-mr1-dev

commit | commitdiff | tree

Robert Greenwalt [Wed, 15 Jun 2016 21:59:38 +0000 (14:59 -0700)]

Move struct def out of an #ifdef

It was only visible if the vendor used a particular
style (SHLIB).

bug:28961371
bug:28567303
Change-Id: I54256e17170a69bdb6fbb9b38924b42906b85896

Fix responseCarrierRestrictions string wrting to parcel
am: b460ba8ecc

Change-Id: If4f661b2e6030d02fde3a7b83bf437ed1dc9691a

Fix responseCarrierRestrictions string wrting to parcel

In Java land, string are read from parcel by readString16.
Hence writeString16 should be invoked in C land,
instead of writeCString

Bug: 28564314
Change-Id: I0ede376541b54d72867f07b96ae52c4a8ed3695f

Merge \"Fix dispatchCarrierRestrictions string reading from parcel\" into nyc-mr1-dev
am: 6d445bb4a1

Change-Id: I1e37eff0f97583b7eeaab306157eb8fbded974fd

Merge "Fix dispatchCarrierRestrictions string reading from parcel" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 8 Jun 2016 21:34:01 +0000 (21:34 +0000)]

Merge "Fix build failure which occurs after setting macro RILC_LOG. am: 626099ec9b am: 4d43056697" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 21:33:51 +0000 (21:33 +0000)]

Fix build failure which occurs after setting macro RILC_LOG. am: 626099ec9b
am: 075aa9baca

Change-Id: I8623e9d123f7eb04022a1a7444d07de81faf1b5f

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 21:33:51 +0000 (21:33 +0000)]

Fix build failure which occurs after setting macro RILC_LOG. am: 626099ec9b
am: 4d43056697

Change-Id: I35fbf9b0ac7ddf7704df51b9adda65f82d022203

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 21:31:20 +0000 (21:31 +0000)]

Fix build failure which occurs after setting macro RILC_LOG.
am: 626099ec9b

Change-Id: I193a57f676a81a5835d4506550f94278cbc127cc

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 21:31:20 +0000 (21:31 +0000)]

Fix build failure which occurs after setting macro RILC_LOG.
am: 626099ec9b

Change-Id: Ib31836f36366246e3229635ceee3fa04e6a404f8

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 21:09:26 +0000 (14:09 -0700)]

Fix build failure which occurs after setting macro RILC_LOG.

Bug: 29214796
Change-Id: I5f74981a59344078f900ecf769cc962b1416d5fd

Fix dispatchCarrierRestrictions string reading from parcel

The parcel is passed from Java land where string are write to
parcel by writeString16. In C land, the string should be read
by readString16 instead of readCString.

Bug: 28564314
Change-Id: Ib6d9f0fd3895c7836bd9d7c2df879269bb29ae4e

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Jun 2016 17:14:15 +0000 (17:14 +0000)]

Increase buffer size for storing /proc/cmdline to avoid buffer overflow.
am: fcd7395ffc

Change-Id: I74b42d967e069d06676dd9e2ec9c01da63f21b84

commit | commitdiff | tree

Sanket Padawe [Mon, 6 Jun 2016 18:21:24 +0000 (11:21 -0700)]

Increase buffer size for storing /proc/cmdline to avoid buffer overflow.

Bug: 29115540
Change-Id: I875532f119aef908f7c7afbbd2224a5252c972ee

commit | commitdiff | tree

Michael Wright [Fri, 3 Jun 2016 19:02:17 +0000 (19:02 +0000)]

Merge "Don\'t clobber the last null terminator when reading /proc/cmdline." into nyc-mr1-dev
am: a0b379fe68

* commit 'a0b379fe68152bedaa3b1eed1d84c5c4fbf11ae1':
Don't clobber the last null terminator when reading /proc/cmdline.

Change-Id: I6a970e2ecbabf33e0f02e7e189abc8c3e33a12f2

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Jun 2016 18:36:54 +0000 (18:36 +0000)]

Merge "Don't clobber the last null terminator when reading /proc/cmdline." into nyc-mr1-dev

commit | commitdiff | tree

Robert Greenwalt [Fri, 3 Jun 2016 16:45:51 +0000 (16:45 +0000)]

Add support for UNSOL PCO Data.
am: 27e99c5ab6

* commit '27e99c5ab67cd997b29a88bbef0250b1f77ceda8':
Add support for UNSOL PCO Data.

Change-Id: I83cd610f0d9ce9fe0856783e65b63f458bbe409c

commit | commitdiff | tree

Michael Wright [Fri, 3 Jun 2016 15:09:53 +0000 (16:09 +0100)]

Don't clobber the last null terminator when reading /proc/cmdline.

Right now, if /proc/cmdline is larger than the buffer size (1024)
then the read will overwrite all of the null terminators and the
ensuing strstr calls will continue past the end of the buffer.

Bug: 29115540
Change-Id: I2da2f28edabd7926d40dbcea52ebaf7165c44e04

commit | commitdiff | tree

Robert Greenwalt [Wed, 1 Jun 2016 23:31:38 +0000 (16:31 -0700)]

Add support for UNSOL PCO Data.

bug:28961371
bug:28567303
Change-Id: Ibbb415c9f5799d666b1599ed0abf97ec24642a3a

ril: make sure ril response on RIL version error
am: df8398cf7a

* commit 'df8398cf7a21d512d36d64d896f90e1d04bbc95f':
ril: make sure ril response on RIL version error

Change-Id: I6c9f6e711ca1f326f0b7fc50dad770e63aa0d3b1

ril: make sure ril response on RIL version error

Fix issue: in dispatchCarrierRestrictions(), when unsupported RIL
version detected, no RIL response is received.
Root cause: the error handling code doesn't send actual RIL request.
Solution: call RIL_onRequestComplete() so that RIL response with
designated error code like RIL_E_REQUEST_NOT_SUPPORTED.

Bug: 28564314
Change-Id: I3f91cf1d14f39813471b36f1fe4c4e0d9f6dbd60

Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS
am: b4e343127f

* commit 'b4e343127f3bbf782a56849d80f7278c49c563ee':
Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS

Change-Id: I518f9b7cdf371b9e05c2aa33a1d1c76be2bce4de

Add RIL command RIL_REQUEST_SET_CARRIER_RESTRICTIONS and RIL_REQUEST_GET_CARRIER_RESTRICTIONS

Bug: 28564314
Change-Id: I38792d59c4602a3e2126c58ac0b8c2487cccff04

commit | commitdiff | tree

Chih-Hung Hsieh [Mon, 16 May 2016 19:41:30 +0000 (19:41 +0000)]

resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp
am: 78e2c9c17f

* commit '78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b':
Fix misc-macro-parentheses warnings.

Change-Id: I78cd4684a0cc020c6f85343f886b3868d7022c17

commit | commitdiff | tree

Robert Greenwalt [Mon, 16 May 2016 19:36:42 +0000 (12:36 -0700)]

resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp

Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d

commit | commitdiff | tree

Chih-Hung Hsieh [Mon, 16 May 2016 18:50:38 +0000 (18:50 +0000)]

Merge "Fix misc-macro-parentheses warnings."
am: e8505bf06e

* commit 'e8505bf06e2f17babe479230e62e6e7d1b8c4bca':
Fix misc-macro-parentheses warnings.

Change-Id: I40b3707b3206aff65312786db1899949a0ed6b53

commit | commitdiff | tree

Treehugger Robot [Mon, 16 May 2016 18:43:31 +0000 (18:43 +0000)]

Merge "Fix misc-macro-parentheses warnings."

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 12 May 2016 17:01:16 +0000 (10:01 -0700)]

Fix misc-macro-parentheses warnings.

Bug: 28705665
Change-Id: Ib7520c64075a652eb0b15483f36383c4632624d1

commit | commitdiff | tree

Sanket Padawe [Mon, 9 May 2016 19:28:23 +0000 (19:28 +0000)]

Merge "RIL: release unsol wakelock" into nyc-dev am: 22b45625aa
am: 56292f9d24

* commit '56292f9d2481f4a073fdcae5fe71dbb7d1aadf65':

Change-Id: I5771e4997f3bf1da6ebe526e9aa49ae37caa9205

commit | commitdiff | tree

Sanket Padawe [Mon, 9 May 2016 19:27:29 +0000 (19:27 +0000)]

Merge "RIL: release unsol wakelock" into nyc-dev am: 22b45625aa
am: 63a8a6cd32

* commit '63a8a6cd32d75857925fd54a2ecd173ddfa9322a':
RIL: release unsol wakelock

Change-Id: If0ccf116d156398f1d4a0b4cfda94f4490e2b07d

commit | commitdiff | tree

Sooraj Sasindran [Mon, 9 May 2016 19:21:55 +0000 (19:21 +0000)]

Merge "RIL: release unsol wakelock" into nyc-dev
am: 22b45625aa

* commit '22b45625aa72ef9311bf23cd785eccce9535efa5':
RIL: release unsol wakelock

Change-Id: I24114554188c19eac5f3fc005d0ae118c7c3496e

commit | commitdiff | tree

Sooraj Sasindran [Mon, 9 May 2016 19:21:53 +0000 (19:21 +0000)]

Merge "RIL: release unsol wakelock" into nyc-dev
am: 22b45625aa

* commit '22b45625aa72ef9311bf23cd785eccce9535efa5':
RIL: release unsol wakelock

Change-Id: I0930de5a9e29b1b66cd207a52ba2e558eeb3cff2

commit | commitdiff | tree

Sanket Padawe [Mon, 9 May 2016 19:08:41 +0000 (19:08 +0000)]

Merge "RIL: release unsol wakelock" into nyc-dev

commit | commitdiff | tree

Sooraj Sasindran [Fri, 6 May 2016 23:19:56 +0000 (16:19 -0700)]

RIL: release unsol wakelock

Make sure to release unsol wakelock

BUG=28635279
Change-Id: I4bdf0e7b35df4e6aa077b062ab359c6938ce8292

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 May 2016 03:31:13 +0000 (03:31 +0000)]

Merge "Specify the INVALID flag for BSIC to be 0xFF am: f3769da0a3 am: 035f677577" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Nathan Harold [Fri, 6 May 2016 03:31:01 +0000 (03:31 +0000)]

Specify the INVALID flag for BSIC to be 0xFF am: f3769da0a3
am: 035f677577

* commit '035f6775779367eacd12b6e11c690341cc84b17f':
Specify the INVALID flag for BSIC to be 0xFF

Change-Id: I6c4de77a0839764bec8dc87924f41bfbdf562989

commit | commitdiff | tree

Nathan Harold [Fri, 6 May 2016 03:31:00 +0000 (03:31 +0000)]

Specify the INVALID flag for BSIC to be 0xFF am: f3769da0a3
am: 8a6a67ad90

* commit '8a6a67ad90745bea7e90c33b9817213af1b5636b':
Specify the INVALID flag for BSIC to be 0xFF

Change-Id: I0a1edf934ebe7269a97ea03379007af5fc5cbe32

commit | commitdiff | tree

Nathan Harold [Fri, 6 May 2016 03:26:12 +0000 (03:26 +0000)]

Specify the INVALID flag for BSIC to be 0xFF
am: f3769da0a3

* commit 'f3769da0a39e2d8116d415f6fd1cba4f1648c03b':
Specify the INVALID flag for BSIC to be 0xFF

Change-Id: I77e3c5e8ed6283870d748900b1b6984d85138246

commit | commitdiff | tree

Nathan Harold [Fri, 6 May 2016 03:26:11 +0000 (03:26 +0000)]

Specify the INVALID flag for BSIC to be 0xFF
am: f3769da0a3

* commit 'f3769da0a39e2d8116d415f6fd1cba4f1648c03b':
Specify the INVALID flag for BSIC to be 0xFF

Change-Id: I9676bb84fa15d888abda71ca73360d2f9805b106

commit | commitdiff | tree

Nathan Harold [Thu, 5 May 2016 19:19:39 +0000 (12:19 -0700)]

Specify the INVALID flag for BSIC to be 0xFF

Bug: 28299027
Change-Id: I3786265a266508d6ea842ccc2a2c3dcf99c3654f

commit | commitdiff | tree

Aurimas Liutikas [Fri, 29 Apr 2016 04:22:17 +0000 (04:22 +0000)]

Merge "Suppress unused-parameter warnings in libril." am: a22b128851 am: 5eaec8ba33
am: 36dc009f87

* commit '36dc009f87af46fa7e9780cdae25de2f2f6bd5bd':
Suppress unused-parameter warnings in libril.

Change-Id: I1d223c07c755f3452628af431505a0e484c0c211

commit | commitdiff | tree

Aurimas Liutikas [Fri, 29 Apr 2016 04:19:27 +0000 (04:19 +0000)]

Merge "Suppress unused-parameter warnings in libril." am: a22b128851
am: 5eaec8ba33

* commit '5eaec8ba3354075a2aa66b134a93bc851327cb57':
Suppress unused-parameter warnings in libril.

Change-Id: I859774e38c07c92634567e91ef129e38a4e1998d

commit | commitdiff | tree

Aurimas Liutikas [Fri, 29 Apr 2016 04:16:42 +0000 (04:16 +0000)]

Merge "Suppress unused-parameter warnings in libril."
am: a22b128851

* commit 'a22b128851c769f18ab6e1dde38ef5a4c32c28c2':
Suppress unused-parameter warnings in libril.

Change-Id: I9c6d05fae4dbb4ff29c44146c7cc221fa1a44a50

commit | commitdiff | tree

Aurimas Liutikas [Fri, 29 Apr 2016 04:10:49 +0000 (04:10 +0000)]