Chih-hung Hsieh
fb44ca5178
Merge "Fix google-explicit-constructor warnings." am: 7bdd6a8b5a
...
am: 427d8d840f
2016-04-30 05:16:35 +00:00
Chih-Hung Hsieh
1c563d96f0
Fix google-explicit-constructor warnings.
...
Bug: 28341362
Change-Id: I4504e98a8db31e0edcbe63c23f9af43eb13e9d86
2016-04-29 15:44:04 -07:00
Elliott Hughes
7b2d2d6afa
Merge "Remove debugging code for a fixed 3.6 kernel bug." am: af61acc
...
am: 058fd2e
2016-04-09 00:31:32 +00:00
Elliott Hughes
ad19af7132
Remove debugging code for a fixed 3.6 kernel bug.
...
Change-Id: If17d41d6151cd7b81677afc5d341d7aa788170e4
2016-04-04 16:06:53 -07:00
Brian Carlstrom
de6d6041c1
system/core: Make Thread::run threadName argument required
...
am: e71b914775
2016-03-14 15:24:54 +00:00
Brian Carlstrom
e71b914775
system/core: Make Thread::run threadName argument required
...
Bug: 27557176
Change-Id: Iae83a1e5489c86c2858fc8481f246b8480f0eec4
2016-03-12 21:32:52 -08:00
George Burgess IV
02f689e11a
Merge "Cleanup uses of sprintf so we can deprecate it." am: 2c5b89a64a
...
am: 3368bdebba
2016-03-08 07:41:39 +00:00
George Burgess IV
e7aa2b2c83
Cleanup uses of sprintf so we can deprecate it.
...
Also cleans up two instances of open() with useless mode params, and
changes a few uses of snprintf to use sizeof(buffer) instead of
hardcoded buffer sizes.
Change-Id: If11591003d910c995e72ad8f75afd072c255a3c5
2016-03-07 18:40:40 -08:00
James Hawkins
650ba8b8d6
Merge "system/core/lib[c]utils: Fix signedness comparison warnings." am: bba2151b29
...
am: 65df16b05f
2016-03-01 20:32:09 +00:00
James Hawkins
b898075f30
system/core/lib[c]utils: Fix signedness comparison warnings.
...
* Store the output of a length variable in size_t.
* Annotate unsigned constant values as such.
Bug: 27384813
Change-Id: I8504c0a8f5840d4d42e5c0df797a4e5d02d13eb9
2016-03-01 11:21:53 -08:00
Dan Willemsen
9dddd137c7
Fix windows 64-bit builds
...
pid_t is 64-bit in 64-bit mingw, but the windows process/thread
functions return a DWORD(uint32_t). Instead of promoting to a pid_t and
fixing the format strings, just use a uint32_t to store the values.
android_thread_id also cannot be a 64-bit pointer, so for windows just
force it to be a uint32_t.
libutils/ProcessCallStack only works under Linux, since it makes heavy
use of /proc. Don't compile it under Windows or Darwin.
Bug: 26957718
(cherry picked from commit 86cf941c48
2016-02-25 18:43:55 -08:00
Dimitry Ivanov
ca0c8ce614
Merge "Make libutils symbols protected" into nyc-dev
...
am: aa2cf3facf
2016-02-25 21:10:24 +00:00
Dimitry Ivanov
96ccb85fa2
Make libutils symbols protected
...
This change is a workaround for apps linking
libutils statically and dynamically which causes
them to crash for newer version of Android.
Bug: http://b/27313399
Change-Id: I47ac4146041b6eeef03cb605ea436719d552ec8f
(cherry picked from commit 2c7960c8d9
2016-02-25 13:09:40 -08:00
Dimitry Ivanov
2c7960c8d9
Make libutils symbols protected
...
This change is a workaround for apps linking
libutils statically and dynamically which causes
them to crash for newer version of Android.
Bug: http://b/27313399
Change-Id: I47ac4146041b6eeef03cb605ea436719d552ec8f
2016-02-25 11:44:35 -08:00
James Hawkins
22b6f7a559
resolve merge conflicts of 0f5d443d0c to nyc-dev-plus-aosp
...
Change-Id: I850bda0808ae17ade5bc0e667211a599d284d6e3
2016-02-19 11:10:30 -08:00
James Hawkins
bd04bb0d29
Merge "system/core: Cleanup direct calls to opendir by containing in a std::unique_ptr."
2016-02-19 17:49:13 +00:00
Samuel Tan
cf1649da00
Merge "libutils: add String8 and String16 std_string utility methods" am: fb0670d650
...
am: 941d48f0ee
2016-02-19 04:49:17 +00:00
Samuel Tan
4b2e76966e
Merge "libutils: remove whitespace from String8 files" am: e771e846a8
...
am: 450b9b7068
2016-02-19 04:49:08 +00:00
Samuel Tan
9ac4e005b4
libutils: add String8 and String16 std_string utility methods
...
Add utility methods that convert String16 and String8 into
std::string.
Also, remove a repeated include of <utils/Unicode.h> in
String16.h, since it is not used in that header file,
and is already included in String16.cpp.
BUG: 27200800
Change-Id: I5238aeb70689499763060a99dff9950fbb7adb3e
TEST: libutils builds successfully.
2016-02-18 17:04:23 -08:00
Samuel Tan
95fd527065
libutils: remove whitespace from String8 files
...
Remove trailing whitespace from String8 header and
cpp files.
BUG: None
Change-Id: Ie77da3f0fbce9cdce20225ce1310cf62295179a4
2016-02-18 17:04:20 -08:00
James Hawkins
588a2cad7f
system/core: Cleanup direct calls to opendir by containing in a
...
std::unique_ptr.
Bug: 26643633
Change-Id: Ia3491fdbff086558da694ae949cf08e4c89d0307
2016-02-18 14:52:46 -08:00
Samuel Tan
9518b9db5b
Merge "libutils: remove whitespaces in String16.cpp and String16.h"
...
am: 8c09555aac
2016-02-17 00:38:10 +00:00
Samuel Tan
f9d16ef106
libutils: remove whitespaces in String16.cpp and String16.h
...
Remove trailing whitespaces in both these files.
BUG: None
Change-Id: I18eca5162871b5b2bf7757a7ef36a4e80073798c
2016-02-16 15:21:34 -08:00
Dan Willemsen
cf1381c834
Merge "Fix windows 64-bit builds"
...
am: 3f68ba4dc6
2016-02-08 23:59:59 +00:00
Dan Willemsen
86cf941c48
Fix windows 64-bit builds
...
pid_t is 64-bit in 64-bit mingw, but the windows process/thread
functions return a DWORD(uint32_t). Instead of promoting to a pid_t and
fixing the format strings, just use a uint32_t to store the values.
android_thread_id also cannot be a 64-bit pointer, so for windows just
force it to be a uint32_t.
libutils/ProcessCallStack only works under Linux, since it makes heavy
use of /proc. Don't compile it under Windows or Darwin.
Bug: 26957718
Change-Id: I4e43e7cf18a96f22b3a9a08dbab8c3e960c12930
2016-02-05 16:10:10 -08:00
Nick Kralevich
261952e570
Merge "more O_CLOEXEC" am: 920d637d25
...
am: 890cd99709
2015-12-18 23:05:34 -08:00
Nick Kralevich
c68c8862f9
more O_CLOEXEC
...
Change-Id: I330aef8d6f1fc35d6649995ef312954b84dff555
2015-12-18 20:57:25 -08:00
Sergio Giro
43f13d0d68
Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c am: e483305e47
...
am: a96cd36afb
2015-11-20 17:17:38 +00:00
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
8f3ef3fd09
Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870 am: 0c69e9f271
...
am: 40f76c2fed
2015-11-05 21:11:03 +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
dc7694eac5
Merge "Teach sp<> how to std::move" am: 518d043c86 am: bb12b91ae1
...
am: a573d6b186
2015-11-03 00:14:15 +00:00
John Reck
bb12b91ae1
Merge "Teach sp<> how to std::move"
...
am: 518d043c86
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
6db2d260b2
Merge "Disable sanitization for LinearTransform" am: c52b3c08fa am: 0d3b144372
...
am: eb1adff81e
2015-10-22 19:50:52 +00:00
Andy Hung
0d3b144372
Merge "Disable sanitization for LinearTransform"
...
am: c52b3c08fa
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
d155004e78
am 51209a8b: am 9443fd94: am f8376607: Merge "system/core: fix iterator for LruCache"
...
* commit '51209a8b93d85f8b7f3b6a106c41c1aa03190f2c':
system/core: fix iterator for LruCache
2015-10-13 07:45:36 +00: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
7e59e17474
am 0b2bce06: am bda375fa: am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap"
...
* commit '0b2bce06382b5517a4dba33da5328c751f2c7a3e':
Implement C++11 move semantics for android::FileMap
2015-10-02 01:31:53 +00: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
Sergio Giro
a5f71e075a
system/core: remove BasicHashtable
...
Towards deprecation of SharedBuffer
Change-Id: Id6d1c8637583df38b6f28398b6804d9c1e96472a
(cherry picked from commit f84a4906fa
2015-10-01 13:18:13 -07: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
3412280cbc
resolved conflicts for 075f690d to master
...
Change-Id: I35b870a1e43b9a4b9f09ecabee68c54f993b036f
2015-10-01 20:21:56 +01: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
45dd164bff
Revert "resolved conflicts for 70808827 to stage-aosp-master"
...
This reverts commit 5cf2d5c9cc
2015-10-01 18:33:25 +00:00
Sergio Giro
5cf2d5c9cc
resolved conflicts for 70808827 to stage-aosp-master
...
Change-Id: I5e5030a20f2be3bd15b9fec8192dd22ec5a34d87
2015-10-01 18:54:33 +01:00
