Narayan Kamath
9d8889c598
am f6fae931: am f9df4b13: am c40cf1ce: Merge "Remove useless refCounting from FileMap."
...
* commit 'f6fae93164ec8505153241b24ccce85cc4ac0f9e':
Remove useless refCounting from FileMap.
2015-02-24 13:09:47 +00:00
Narayan Kamath
f9df4b13bc
am c40cf1ce: Merge "Remove useless refCounting from FileMap."
...
* commit 'c40cf1ce9d6910685bf2242c1db390af00684d9d':
Remove useless refCounting from FileMap.
2015-02-24 12:56:45 +00:00
Narayan Kamath
6832a7a4e0
Remove useless refCounting from FileMap.
...
Nobody ever called acquire() so release() was always
equivalent to delete. Just use delete instead so that
people can use unique_ptr directly (or shared_ptr if
they really want refcounts).
Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
2015-02-23 15:49:43 +00:00
Andreas Gampe
9f08ce8886
am f320e8e5: am ed318bff: Merge "log.h: Fix typo"
...
* commit 'f320e8e53df75ba50db755c89843251e481dc696':
log.h: Fix typo
2015-02-11 02:48:05 +00:00
Mark Salyzyn
ee632f734a
am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41
...
* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
log.h: wrap android_testLog around __android_log_is_loggable
log.h: deprecate CONDITION
2015-02-11 02:48:04 +00:00
Mark Salyzyn
2044a34ca7
am 2671ffb6: am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
...
* commit '2671ffb6191aadf17cd8770ffcc235bc0591e03f':
liblog: add __android_log_is_loggable()
2015-02-11 02:48:01 +00:00
Andreas Gampe
f320e8e53d
am ed318bff: Merge "log.h: Fix typo"
...
* commit 'ed318bff41c4515ca79a11afb97507a452e9fcd3':
log.h: Fix typo
2015-02-10 16:53:30 +00:00
Mark Salyzyn
8a5198a150
am fd867303: Merge changes I420b5b8a,Ica23fe41
...
* commit 'fd867303861eb25bf7973739e71dc29b6356a336':
log.h: wrap android_testLog around __android_log_is_loggable
log.h: deprecate CONDITION
2015-02-10 16:53:24 +00:00
Mark Salyzyn
2671ffb619
am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
...
* commit '95f7ecbd38df680c5295295bd2277f4b26865f1f':
liblog: add __android_log_is_loggable()
2015-02-10 16:52:48 +00:00
Andreas Gampe
f45bbe496f
log.h: Fix typo
...
Change-Id: I6b5e9bc9d40e5e5ecf9f50f7392675391e6f18e6
2015-02-09 16:13:33 -08:00
Mark Salyzyn
1df92e523e
log.h: wrap android_testLog around __android_log_is_loggable
...
- take android_testLog from the bonepile and resurrect
- android_testLog is used, and makes sense in its current context
as a holder for Android Logging policy.
- Default level when not specified is ANDROID_LOG_VERBOSE for
eng and userdebug, and ANDROID_LOG_DEBUG for user.
NB: Properties, which are associated with __android_log_is_loggable are
not to be adjusted in user release; it would be useful at that juncture to
return a constant of (0) for VERBOSE, and a (1) for others on user builds.
Or default level to drop to ANDROID_LOG_DEBUG for all in future.
Bug: 17760225
Change-Id: I420b5b8a94d53d664c6a8b13546ebc424a147923
2015-02-09 15:37:32 -08:00
Mark Salyzyn
f5af82edf3
log.h: deprecate CONDITION
...
- replace CONDITION with __predict_false to match with bionic
Change-Id: Ica23fe41cf9a7ea5eaf1b8552780af9ec7827808
2015-02-09 15:25:48 -08:00
Mark Salyzyn
956870518e
liblog: add __android_log_is_loggable()
...
- Add new liblog API __android_log_is_loggable(prio, tag, def)
- future plan to integrate this into the runtime checks and into
the logd daemon for filtration. Inert for now.
Bug: 17760225
Change-Id: I16395b4d42acc08f0209f55a1cbf87b0b2112898
2015-02-09 22:12:59 +00:00
Christopher Ferris
14b964f52e
am e6ed63e6: am c9c401e6: Merge "Move map data into backtrace data proper."
...
* commit 'e6ed63e610c5e6a56b04a5168e873dfa48c73aec':
Move map data into backtrace data proper.
2015-02-09 04:13:37 +00:00
Elliott Hughes
bc32de07e9
am b164b103: am 5e753100: Merge "Clean up reading and writing in init."
...
* commit 'b164b103ebdcb2b567079f30e38d878a21a9b632':
Clean up reading and writing in init.
2015-02-09 04:13:02 +00:00
Christopher Ferris
e6ed63e610
am c9c401e6: Merge "Move map data into backtrace data proper."
...
* commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a':
Move map data into backtrace data proper.
2015-02-06 23:43:11 +00:00
Christopher Ferris
c9c401e64b
Merge "Move map data into backtrace data proper."
2015-02-06 23:29:00 +00:00
Christopher Ferris
12385e3ad0
Move map data into backtrace data proper.
...
The backtrace structure used to include a pointer to a backtrace_map_t
that represented the map data for a particular pc. This introduced a
race condition where the pointer could be discarded, but the backtrace
structure still contained a pointer to garbage memory. Now all of the map
information is right in the structure.
Bug: 19028453
Change-Id: If7088a73f3c6bf1f3bc8cdd2bb4b62e7cab831c0
2015-02-06 15:00:09 -08:00
Elliott Hughes
b164b103eb
am 5e753100: Merge "Clean up reading and writing in init."
...
* commit '5e753100c32c7b42ae4306a8023c419defd34c4e':
Clean up reading and writing in init.
2015-02-06 22:33:18 +00:00
Elliott Hughes
f682b4786a
Clean up reading and writing in init.
...
This isn't particularly useful in and of itself, but it does introduce the
first (trivial) unit test, improves the documentation (including details
about how to debug init crashes), and made me aware of how unpleasant the
existing parser is.
I also fixed a bug in passing --- unless you thought the "peboot" and "pm"
commands were features...
Bug: 19217569
Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
2015-02-06 14:20:30 -08:00
Elliott Hughes
07e0ee7cf4
am dcbeb41a: am d558530b: Merge "Fix Windows build."
...
* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
Fix Windows build.
2015-02-05 20:15:04 +00:00
Elliott Hughes
dcbeb41a67
am d558530b: Merge "Fix Windows build."
...
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
Fix Windows build.
2015-02-05 18:51:07 +00:00
Paul McLean
9d13e782c6
Merge "Adding name field to AudioPort for enum/select API."
2015-02-05 18:13:48 +00:00
Elliott Hughes
d79801d60d
Fix Windows build.
...
Take 2. Probably should have done this in the beginning, but thought I was
being clever.
Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes
495952fef2
am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '44fdd5d15a8851e4053af168e7235b30a5f4d34d':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:36:47 +00:00
Elliott Hughes
44fdd5d15a
am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes
202f024dee
Add a WriteStringToFile overload that cares about permissions.
...
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes
814cb64fb4
am 8a2634c2: am 55732f49: Merge "android_reboot should take a const char*."
...
* commit '8a2634c2ab3914abeb43e0edf46fa69852b6b15d':
android_reboot should take a const char*.
2015-02-04 15:03:49 +00:00
Elliott Hughes
8a2634c2ab
am 55732f49: Merge "android_reboot should take a const char*."
...
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Elliott Hughes
0068da6a93
android_reboot should take a const char*.
...
The kernel argument is actually a void*, but it's only read from.
Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes
25c2f84c5e
am 14fcc4c6: am e44d25d6: Merge "Add Google-style StringPrintf."
...
* commit '14fcc4c66cbd7e55a12315d985b0723ef4a527ff':
Add Google-style StringPrintf.
2015-02-03 23:41:33 +00:00
Elliott Hughes
14fcc4c66c
am e44d25d6: Merge "Add Google-style StringPrintf."
...
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes
e44d25d645
Merge "Add Google-style StringPrintf."
2015-02-03 23:23:11 +00:00
Elliott Hughes
6b3be2902d
Add Google-style StringPrintf.
...
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes
e17fc7cf3c
am c3bf8d85: am 9fc43358: Merge "Extra Win32 compatibility."
...
* commit 'c3bf8d85b58c4a4711983adcd6321a580d6835b1':
Extra Win32 compatibility.
2015-02-03 22:56:42 +00:00
Elliott Hughes
c3bf8d85b5
am 9fc43358: Merge "Extra Win32 compatibility."
...
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes
714196d05c
Extra Win32 compatibility.
...
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes
a803b7697f
am 813d0ac1: am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
...
* commit '813d0ac13614b6199f407762f679afc9f439be7e':
Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:39:30 +00:00
Elliott Hughes
813d0ac136
am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
...
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes
dec12b2b71
Add Google-style ReadFileToString and WriteStringToFile.
...
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes
d3e3bfd6c0
am dbf6f33e: am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit 'dbf6f33e84a4de9944b782ec079ba8b51f3e9c25':
Revert "Remove netcfg's unused options."
2015-02-03 20:15:17 +00:00
Elliott Hughes
dbf6f33e84
am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes
c463025a19
Revert "Remove netcfg's unused options."
...
This reverts commit f8e83054cb
.
Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes
d58fe3880e
am b862d3e8: am 6a728fde: Merge "Remove netcfg\'s unused options."
...
* commit 'b862d3e8eb92323983020830f3d39240d6cfbee3':
Remove netcfg's unused options.
2015-02-03 19:18:43 +00:00
Elliott Hughes
d4e71f154e
am 5b253e55: am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit '5b253e55e0ac4d6b935036c1e8aa5151caf09ccc':
Revert "Remove netcfg's unused options."
2015-02-03 19:18:42 +00:00
Elliott Hughes
85ed30d881
am 1ddbd76b: am 67900498: Merge "Remove netcfg\'s unused options."
...
* commit '1ddbd76bd8eededb5d854dc588d3cef68cdc0c69':
Remove netcfg's unused options.
2015-02-03 19:18:41 +00:00
Elliott Hughes
b862d3e8eb
am 6a728fde: Merge "Remove netcfg\'s unused options."
...
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes
5b253e55e0
am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes
1ddbd76bd8
am 67900498: Merge "Remove netcfg\'s unused options."
...
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes
f8e83054cb
Remove netcfg's unused options.
...
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.
Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00