aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4d11e705: Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-312-1/+5
|\ | | | | | | | | * commit '4d11e705cb073e55283452e6fd50e3feff54f82c': Fix the aprotoc target for Windows.
| * Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-292-1/+5
| |\
| | * Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-282-1/+5
| |/ | | | | | | | | | | Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
* | am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-221-4/+4
|\ \ | |/ | | | | | | * commit '95d99df4574c28debcf9646056a0350ff44bc7c9': Don't return NULL from {Boxed}PrimitiveTypeName.
| * Merge "Don't return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-211-4/+4
| |\
| | * Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
| |/ | | | | | | | | | | | | The behavior of the string ctor is undefined when you pass NULL. This is checked strictly in C++11, so fails to compile. Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
* | am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-182-2/+69
|\ \ | |/ | | | | | | * commit '11607eb10bcf3a46e92257966949d48b28bb7bf3': Add a hasExtension method to ExtendableMessageNano.
| * Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-172-2/+69
| |\
| | * Add a hasExtension method to ExtendableMessageNano.Juan Silveira2014-07-172-2/+69
| |/ | | | | | | | | | | | | It allows checking for the presence of an extension without having to deserialize the field. Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
* | am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-07-157-16/+36
|\ \ | |/ | | | | | | * commit 'a88808d414308b5b567d3afaab56fc338ad80667': Fix access around unknownFieldData.
| * Merge "Fix access around unknownFieldData."Max Cai2014-07-147-16/+36
| |\
| | * Fix access around unknownFieldData.Max Cai2014-07-157-16/+36
| |/ | | | | | | | | | | | | | | | | | | | | Instead of publishing its class I chose to encapsulate the troublesome references in equals()/hashCode() in the generated code into superclass methods in ExtendableMessageNano. Changed a couple of java packages in the test suite to catch this issue easier in the future. Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
* | am daf63839: Merge "Keep pointers to extension values."Max Cai2014-07-158-256/+920
|\ \ | |/ | | | | | | * commit 'daf638399bd42122306786e8062f392ddace4363': Keep pointers to extension values.
| * Merge "Keep pointers to extension values."Max Cai2014-07-148-256/+920
| |\
| | * Keep pointers to extension values.Juan Silveira2014-07-148-256/+920
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of getExtension deserialises the field from bytes and returns a new object every time. This means that changes to those objects are reflected when the messages is serialised unless setExtension is called. It also means that every call to getExtension and setExtension is expensive. This change introduces a FieldData class that contains everything that's known about the field at the time. This can be all the tag/byte[] pairs associated with a given field or an Extension and a value object. This is so that two messages with a repeated extension can be compared even if the extension has been deserialised in one of them but not the other. This change also adds FieldArray class based on SparseArray from the Android compatibility library. This is used in ExtendableMessageNano to make lookup of FieldDatas by their field number faster. Implications: * calling getExtension multiple times deserialises the field only once and returns the same object. * calling setExtension doesn't cause the object to be serialised immediately, that only happens when the container message is serialised. * getExtension is no longer a read-only thread-safe operation. README.txt has been updated to relfect that. * comparison using equals and hashCode continues to work. Bug: 10863158 Change-Id: I81c7cb0c73cc0611a1f7c1eabf5eed259738e8bc
* | am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-210-0/+0
|\ \ | | | | | | | | | | | | * commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf': You CANNOT change the global WITH_DEXPREOPT
| * \ am 8eed3705: You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf': You CANNOT change the global WITH_DEXPREOPT
| | * | You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14380196 Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
* | | | am 39467629: am 6c915d3a: keep history after reset to ↵Baligh Uddin2014-05-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':
| * | | am 6c915d3a: keep history after reset to ↵Baligh Uddin2014-05-210-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
| | * | keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dceBaligh Uddin2014-05-210-0/+0
| | |\ \
| | | * \ reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81Qiwen Zhao2014-05-130-0/+0
| | | |\ \ | | | |/ / | | |/| |
* | | | | am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into ↵Wink Saville2014-05-080-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '2b549b793713eb10b0212f1c5d6c90d9fdeead85': Revert "Merge commit 'e887563a' into fix-merge-conclict"
| * | | | Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into ↵Wink Saville2014-05-075-9/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp
| | * | | | Revert "Merge commit 'e887563a' into fix-merge-conclict"Wink Saville2014-05-075-9/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80. Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
* | | | | | Revert "Merge commit 'e887563a' into fix-merge-conclict"Wink Saville2014-05-072-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80. Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
* | | | | | am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix ↵Jan-Willem Maarse2014-05-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | NPE when clearing an extension in nano protos" * commit '399cf8d641c0bad4cff016f3b1a02c63fb353a21':
| * | | | | am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when ↵Jan-Willem Maarse2014-05-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | clearing an extension in nano protos" * commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':
* | | | | | am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit ↵Bill Yi2014-05-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '8b5d62a4e819cb5114b294fc6754de63d50792b1':
| * | | | | am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit ↵Bill Yi2014-05-070-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':
* | \ \ \ \ \ am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to masterJeff Davidson2014-05-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '7b4e8c78004c479ffc99ec7c677e206cfdf8b73c':
| * | | | | | am 8113c186: resolved conflicts for merge of 592b6078 to masterJeff Davidson2014-05-070-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':
* | \ \ \ \ \ \ am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ↵Max Cai2014-05-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --ignore_service nano proto compiler flag" * commit 'e69eaa2230952424fd410f3378445e78fcf58242':
| * | | | | | | am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano ↵Max Cai2014-05-070-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proto compiler flag" * commit '99c9801813fdc2eccd5db391c00d0250c327e344':
* | \ \ \ \ \ \ \ am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset ↵Max Cai2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cachedSize to 0 in getSerializedSize" * commit '888cafe432fd2da8ae1b36429b5e8f822db11ce0':
| * | | | | | | | am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 ↵Max Cai2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in getSerializedSize" * commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':
* | \ \ \ \ \ \ \ \ am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t ↵Wink Saville2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset cachedSize to 0 in getSerializedSize"" * commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':
| * | | | | | | | | am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset ↵Wink Saville2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cachedSize to 0 in getSerializedSize"" * commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':
* | | | | | | | | | Merge commit 'f65ee555' into fix-merge-conflictWink Saville2014-05-072-39/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f65ee555': Change-Id: Ic1216c50b608f1609fd8a1a1a50209c4486f30a4
| * | | | | | | | | Merge commit 'e887563a' into fix-merge-conclictWink Saville2014-05-075-51/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e887563a': Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"" Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c
* | \ \ \ \ \ \ \ \ \ am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset ↵Wink Saville2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cachedSize to 0 in getSerializedSize" * commit 'd89b3060b40d8485d02e48d11056750495ecb577':
| * | | | | | | | | | am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 ↵Wink Saville2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in getSerializedSize" * commit 'f213b0c6a86503ad752139f04f343578df45db07':
* | \ \ \ \ \ \ \ \ \ \ am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error ↵Wink Saville2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on mac 10.9" * commit '27243737cc739c25c8905cbe9b3040f500af127d':
| * | | | | | | | | | | am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"Wink Saville2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':
* | \ \ \ \ \ \ \ \ \ \ \ am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."Max Cai2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8f7a71c113c692102115cf56071e7c24cf09c88':
| * | | | | | | | | | | | am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."Max Cai2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9141054bc24597968ddb94fb466c07cd2a933706':
* | \ \ \ \ \ \ \ \ \ \ \ \ am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes ↵Max Cai2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9fecff3c,I2c1eb07f * commit '286f57055b99aa2c3c107f4cd8f49eeace8db5b5':
| * | | | | | | | | | | | | am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07fMax Cai2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c3544dd69160dc00a7786977da220265a7c43c4':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am c7a7b2ac: resolved conflicts for merge of 6965d891 to ↵Jie Dai2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':
| * | | | | | | | | | | | | | resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aospJie Dai2014-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38
generated by cgit v1.1 at 2024-07-04 17:56:12 +0000