openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,252 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

13252 Commits

Author SHA1 Message Date
Jon Larimer 089ad5e98a Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours 
am: 93a3871abb

* commit '93a3871abbd16a3e0dee6ab8e7e87356620efeac':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:37:51 +00:00
Jon Larimer d0ed7943b8 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev 
am: f84eef3fca  -s ours

* commit 'f84eef3fca156cd9a9f2f09f305a6fd6c898f14b':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:37:43 +00:00
Jon Larimer 93a3871abb Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 
am: 442a830e9b  -s ours

* commit '442a830e9b0415460749016394b3a71b9df2af13':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:50:39 +00:00
Jon Larimer 442a830e9b Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev 
am: 5280061b56

* commit '5280061b5668d87b99ff4f9ef883a3fed944bce4':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:46:21 +00:00
Jon Larimer f84eef3fca Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev 2015-11-11 13:42:37 +00:00
Jon Larimer 5280061b56 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev 2015-11-11 13:42:35 +00:00
William Luh 9a86c283cd Add macro to call event logger for errors. DO NOT MERGE 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:33:46 +00:00
William Luh f34258fa9b Add macro to call event logger for errors. DO NOT MERGE 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:33:32 +00:00
Narayan Kamath 26d47f2671 am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '491035ce1ceec310f98347654ea17cafa6ccb520':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-20 00:08:45 +00:00
Narayan Kamath 81b428f27a am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-20 00:08:44 +00:00
Brian Carlstrom 832a0d1c64 resolved conflicts for cf676a86 to lmp-mr1-ub-dev 
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
 2015-09-19 16:13:00 -07:00
Narayan Kamath 491035ce1c am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '8253cb0436a09dcb325dbdecf4689b0a18b25644':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-17 23:03:11 +00:00
Narayan Kamath db7d8e963c am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-17 23:03:10 +00:00
Narayan Kamath cf676a8686 am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl. 
* commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
  libutils: Fix integer overflows in VectorImpl.
 2015-09-17 23:01:45 +00:00
Narayan Kamath 8253cb0436 am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '0cc468dc2a1420d5c9dac563cc6c5d11b862ff47':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-12 09:46:19 +00:00
Narayan Kamath 68a7837088 am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit '2e64e9590a36511eaaf655b24002d24afe927f04':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-12 09:46:18 +00:00
Narayan Kamath 0cc468dc2a am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-12 08:49:20 +00:00
Narayan Kamath 2e64e9590a am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-12 08:49:15 +00:00
Narayan Kamath 52edd8bdf3 am 419e6c3c: libutils: Fix integer overflows in VectorImpl. 
* commit '419e6c3c68413bd6dbb6872340b2ae0d69a0fd60':
  libutils: Fix integer overflows in VectorImpl.
 2015-09-12 06:30:18 +00:00
Narayan Kamath fef9dffd96 am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '6c53de92cf7e759488538280788325fac6ccdea2':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-11 09:50:09 +00:00
Narayan Kamath a82d6dc3bf resolved conflicts for b638126e to klp-modular-dev 
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
 2015-09-10 22:00:26 +01:00
Narayan Kamath 6c53de92cf Follow up to change b638126ed DO NOT MERGE. 
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
 2015-09-10 20:30:59 +00:00
Narayan Kamath 419e6c3c68 libutils: Fix integer overflows in VectorImpl. 
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
 2015-09-09 12:05:06 +01:00
Narayan Kamath b638126ed3 libutils: Fix integer overflows in VectorImpl. DO NOT MERGE 
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
 2015-09-09 11:20:13 +01:00
Bart Sears 170bde83ae resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev 
Change-Id: I236367bd60046ba06669cbcdae81184f9d0a74c7
 2015-08-26 12:59:28 -07:00
Sergio Giro ba4e6a804d am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit 'bd7dd79e8ce8edcba61249b4d263d20ed98c4c92':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 23:25:12 +00:00
Sergio Giro 7c327194fe am 1dda45c7: am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE] 
* commit '1dda45c7d7605be2601b2f95b90b5673d6bac78c':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-25 16:49:18 +00:00
Sergio Giro 1dda45c7d7 am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE] 
* commit '0cc9a6e6e1f8e675c1238e5e05418cabcc699b52':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]
 2015-08-25 16:43:54 +00:00
Sergio Giro bd7dd79e8c am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit '25592fbea0f38ea369a225e0ef9708442fc9e918':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 16:26:30 +00:00
Sergio Giro 0cc9a6e6e1 libutils: fix overflow in SharedBuffer [DO NOT MERGE] 
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 66b6eb9490)

Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
 2015-08-25 16:18:16 +01:00
Sergio Giro 25592fbea0 am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit 'ca15dfd05cdeea7ed57578aa569831698324b2a0':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 14:19:08 +00:00
Sergio Giro ca15dfd05c am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 14:11:49 +00:00
Sergio Giro 3fe4051430 am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
 2015-08-25 14:06:38 +00:00
Sergio Giro 66b6eb9490 [DO NOT MERGE] libutils: fix overflow in SharedBuffer 
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b83553)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
 2015-08-21 20:36:19 +01:00
Abhishek Arya fc5fdc8568 am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit 'e45d96d6bf592f0ae20bb021ea529acc94e0cb55':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:54:21 +00:00
Abhishek Arya e45d96d6bf am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit '19398a712c53d27aaa2122cfae5d54168b8df0c9':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:36:01 +00:00
Abhishek Arya 19398a712c am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit 'd34846b70b7f6eb167722d45e0c717fa64116e90':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:29:00 +00:00
Abhishek Arya d34846b70b am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:23:50 +00:00
Abhishek Arya cd407a17fe am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
 2015-08-21 06:18:47 +00:00
Abhishek Arya e0dce90b0d Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b 
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
 2015-08-20 21:55:55 -07:00
Sergio Giro 93f106b8d0 am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'e97682be0634fe773f70097bc518e5d034efe8f7':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:58:19 +00:00
Sergio Giro e97682be06 am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:44:57 +00:00
Sergio Giro a1a22b5736 am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:38:33 +00:00
Sergio Giro e67b584869 am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:28:53 +00:00
Sergio Giro 4956c0fe1e am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8 
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
  libutils: fix overflow in String8::allocFromUTF8
 2015-08-20 22:23:47 +00:00
Sergio Giro 5b85b1d40d libutils: fix overflow in String8::allocFromUTF8 
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbeec0)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef2752)
 2015-08-18 20:52:25 +00:00
Adam Lesinski 87b02f23c0 am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '4e8306419073c93f07c7ac69955d990ffa315d96':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 01:23:09 +00:00
Adam Lesinski 4e83064190 am 1def25a2: Merge commit \'7ac60686\' into manualmerge 
* commit '1def25a210ca502a97020efb732775d5c2df2d9a':
  Prevent integer overflow when allocating native_handle_t
 2015-05-28 01:03:55 +00:00
Adam Lesinski 1def25a210 Merge commit '7ac60686' into manualmerge 
Change-Id: I671a57d906ca6826722fb892627d235b14b822eb
 2015-05-27 17:09:14 -07:00
Adam Lesinski 7ac6068636 am 058ad0b6: am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t 
* commit '058ad0b6612457c54c7ad6e3b5d5a618d94ae966':
  Prevent integer overflow when allocating native_handle_t
 2015-05-27 23:40:35 +00:00