Sergio Giro
b7170fe3fe
libutils: fix cache removal when callback invalidates the key
...
Bug: 24785286
Change-Id: I9d17d2247258a56ef7776b3a701389e825a9c533
2015-11-20 14:54:51 +00:00
Dan Albert
f2d2509690
Use std::unique_ptr instead of UniquePtr.
...
Bug: http://b/22403888
Change-Id: I398fa43b8f33c9281d7ff238521d75f1dcb8a5e7
2015-11-05 01:09:22 -08:00
John Reck
bb12b91ae1
Merge "Teach sp<> how to std::move"
...
am: 518d043c86
* commit '518d043c8693835061b02ecbbee4b82fc61a776e':
Teach sp<> how to std::move
2015-11-02 21:39:24 +00:00
John Reck
d69089a742
Teach sp<> how to std::move
...
Arguably we should migrate to std::shared_ptr
but for now make std::vector<sp<>> a bit less
horrible
Change-Id: Ia458a2daff0b656b2f3310b3ea100565ec844c69
2015-10-29 07:17:40 -07:00
Andy Hung
0d3b144372
Merge "Disable sanitization for LinearTransform"
...
am: c52b3c08fa
* commit 'c52b3c08fa5ea3680ffcd68c2a1d0542d09f0509':
Disable sanitization for LinearTransform
2015-10-22 19:46:20 +00:00
Andy Hung
13c19e7703
Disable sanitization for LinearTransform
...
Avoids potential crash on Fugu.
Bug: 25160007
Change-Id: I2e883539e36204821f3eb97f0ae4a4854014f048
2015-10-22 11:20:45 -07:00
Sergio Giro
9443fd94e3
am f8376607
: Merge "system/core: fix iterator for LruCache"
...
* commit 'f83766079e248e04065103a4720364c0193777ee':
system/core: fix iterator for LruCache
2015-10-13 07:36:52 +00:00
Sergio Giro
0cb59c0dce
system/core: fix iterator for LruCache
...
Was failing to return the first element
Change-Id: Ic803f5d463a56519212014d0d190407cf4b859cf
2015-10-12 16:13:44 +01:00
Adam Lesinski
0b2bce0638
am bda375fa
: am c6c6ab50
: Merge "Implement C++11 move semantics for android::FileMap"
...
* commit 'bda375fa41c88e6b2f81a8cd88fc5fdda62bc723':
Implement C++11 move semantics for android::FileMap
2015-10-02 01:25:31 +00:00
Adam Lesinski
bda375fa41
am c6c6ab50
: Merge "Implement C++11 move semantics for android::FileMap"
...
* commit 'c6c6ab50bc11d55f3135312ceccbcf0c400b437e':
Implement C++11 move semantics for android::FileMap
2015-10-02 01:19:25 +00:00
Adam Lesinski
6f8885bc14
Implement C++11 move semantics for android::FileMap
...
FileMaps should be movable, thereby not requiring them to be only used
with a unique_ptr as they currently are.
Change-Id: I0fb8013bf398a2ced5420d85ba888c2a7fc5a496
2015-10-01 12:47:49 -07:00
Sergio Giro
075f690dae
am bdae9bf2
: resolved conflicts for 70808827
to stage-aosp-master
...
* commit 'bdae9bf2ec3bbf8e33a34caa412bd8fd7bc2d434':
system/core: remove BasicHashtable
2015-10-01 18:59:59 +00:00
Sergio Giro
bdae9bf2ec
resolved conflicts for 70808827
to stage-aosp-master
...
Change-Id: I2de8a63fa5be5423846df4c2e8ccc5f12e843f09
2015-10-01 19:49:22 +01:00
Sergio Giro
f84a4906fa
system/core: remove BasicHashtable
...
Towards deprecation of SharedBuffer
Change-Id: Id6d1c8637583df38b6f28398b6804d9c1e96472a
2015-10-01 11:44:47 +01:00
Sergio Giro
c559a9b52f
am b5a00d6b
: am e0453334
: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
...
* commit 'b5a00d6b2e9a386701cf9f3f5997837496a5aa57':
system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:11:38 +00:00
Sergio Giro
b5a00d6b2e
am e0453334
: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
...
* commit 'e045333445ab3ebb8d602d25ed750169f135baa6':
system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:04:50 +00:00
Sergio Giro
0e7fb13d57
libutils: fix compile error in SharedBufferTest
...
Change-Id: Ib1185d417457d03efa102989a64b5b5e4eb5c82a
2015-09-30 10:44:17 -07:00
Sergio Giro
e045333445
Merge "system/core: remove methods returning SharedBuffer in String8, String16"
2015-09-30 15:21:48 +00:00
Sergio Giro
282efae9c3
system/core: remove methods returning SharedBuffer in String8, String16
...
Towards deprecation of SharedBuffer
Change-Id: I3069837db32837bcc0f5d8f1118ccd502c9070dc
2015-09-30 15:42:02 +01:00
Sergio Giro
fbb259e836
am 8e2c8208
: am 730fdbb1
: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
...
* commit '8e2c8208198c1c73c7192b1bd5e87868b53297c6':
system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:26:23 +00:00
Sergio Giro
8e2c820819
am 730fdbb1
: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
...
* commit '730fdbb1ca4c39a4d69868f7a261b023f2bea296':
system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:20:02 +00:00
Sergio Giro
bb58cde899
system/core: change LruCache to use unordered_set instead of BasicHashTable
...
Towards deprecation of BasicHashTable
Change-Id: I3f3d904636a85a794cccf972f6e4a94e7f3808f5
2015-09-30 13:48:30 +01:00
Sergio Giro
8dba9a7bf1
libutils: fix compile error in SharedBufferTest
...
Change-Id: Ib1185d417457d03efa102989a64b5b5e4eb5c82a
2015-09-23 21:22:14 +01:00
Sergio Giro
c565bdb67b
am f777655d
: resolved conflicts for 6ee734cf
to stage-aosp-master
...
* commit 'f777655d85af3aefa4a1683f289da1ec67988330':
libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory
2015-09-23 17:15:12 +00:00
Sergio Giro
f777655d85
resolved conflicts for 6ee734cf
to stage-aosp-master
...
Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897
2015-09-23 17:58:25 +01:00
Sergio Giro
d2529f2830
libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory
...
Some methods in header files of classes using SharedBuffer need
to be moved to the implementation files accordingly
Change-Id: I891f3ace2b940ab219e4e449040bfed71c0547db
2015-09-23 16:22:59 +01:00
Brian Carlstrom
16bed9650a
am 742d0173
: am 661600dd
: am 110f705e
: resolved conflicts for 832a0d1c
to mnc-dev
...
* commit '742d0173e8bd41e137d175c04860c532270b3f5b':
libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:21:47 +00:00
Brian Carlstrom
110f705e10
resolved conflicts for 832a0d1c
to mnc-dev
...
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
2015-09-19 17:29:42 -07: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
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
51e740f802
resolved conflicts for 32d86587
to mnc-dr-dev-plus-aosp
...
Change-Id: I381133e7dd93f908bd3d2b42e8af83d954e428af
2015-09-08 13:59:49 +01:00
Dan Willemsen
a4b8f9f1c2
am bfe32228
: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
...
* commit 'bfe322285fdbe86fdc01fdc4c711e22e894bdaee':
Remove USE_MINGW/CYGWIN; Whitelist windows modules
2015-09-03 00:39:19 +00:00
Dan Willemsen
87a419c8b1
Remove USE_MINGW/CYGWIN; Whitelist windows modules
...
CYGWIN is not supported, USE_MINGW and HOST_OS==windows are being
replaced with LOCAL_..._windows variables.
Bug: 23566667
Change-Id: I3e4a1e4097dc994cf5abdce6939e83a91758fd75
2015-09-02 17:10:35 -07:00
Narayan Kamath
c609c31fb5
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
Change-Id: I46b1ae8ca1f3a010be13aca36a091e76a97a7b70
2015-09-02 12:37:49 +01:00
Nick Kralevich
5e44f5cc0c
am 2c58af52
: Merge "VectorImpl.cpp: fix benign multiplication overflow"
...
* commit '2c58af52232f0c8b4ab09d75eba66d1283805cab':
VectorImpl.cpp: fix benign multiplication overflow
2015-08-28 17:28:37 +00:00
Nick Kralevich
c76698f24e
VectorImpl.cpp: fix benign multiplication overflow
...
j is a ssize_t, which can go negative. If it goes negative,
the resulting multiplication of mItemSize*j doesn't make
any sense. Since the value is never used, just don't perform
the calculation if j < 0.
Bug: 23607865
Change-Id: I14f6f6506645d582f7d67a2e2d60ead3cb18b957
2015-08-28 06:40:23 -07:00
Abhishek Arya
09f2d36e1d
am 5b33306d
: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
...
* commit '5b33306dba456ec906f7c9bd522681c1de137f78':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-26 20:12:44 +00: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
d95e47f136
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: I363f49b5b3c6b7b3ac08cba2c14d72c431588c5a
2015-08-25 17:40:47 +01: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
Nick Kralevich
2bcb9221d4
am 7ec4c228
: am e80ec0c5
: Merge "libutils: Enable LOCAL_SANITIZE := integer"
...
* commit '7ec4c228ee9d50d16306331abacb607bc70fadd8':
libutils: Enable LOCAL_SANITIZE := integer
2015-08-24 21:51:09 +00:00
Nick Kralevich
4d587f2f9a
libutils: Enable LOCAL_SANITIZE := integer
...
Call abort() on undefined or sketchy integer behavior.
Protects against integer overflow attacks.
Change-Id: I475e5e9fb04160dd2d201e926ab2b897539f8bb6
2015-08-24 10:51:38 -07:00
Nick Kralevich
50659902d2
am 4f0a7cb8
: am 786e5e26
: Merge "libutils: cleanups for -fsanitize=integer"
...
* commit '4f0a7cb8e15ce50f7da6a71c96335bd0b7394492':
libutils: cleanups for -fsanitize=integer
2015-08-24 16:02:36 +00:00
Nick Kralevich
1f28698998
libutils: cleanups for -fsanitize=integer
...
* Hashing functions rely on integer overflow behavior.
Mark those functions as safe.
* abort() if a passed in size_t value is greater than
UINT32_MAX. This can occur on 64 bit builds where size_t
is larger than uint32_t.
* Special case the index lookup for an empty sorted vector.
Without the special case, size() == 0, and size()-1 underflows.
Change-Id: I343a14b589fc8f0d221c1998ae5d6f0b9e2781f8
2015-08-24 15:52:22 +00:00
Abhishek Arya
64e2d8c0dc
am 219a006f
: am fc5fdc85
: am e45d96d6
: am 19398a71
: am d34846b7
: am cd407a17
: am e0dce90b
: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '219a006f89a5448a9a6eeb1f37ad0088e85bd3f8':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:12:31 +00:00
Abhishek Arya
219a006f89
am fc5fdc85
: am e45d96d6
: am 19398a71
: am d34846b7
: am cd407a17
: am e0dce90b
: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:05:07 +00: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
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