Commit Graph

9214 Commits

Author SHA1 Message Date
Jeff Brown c24b98c7d8 Add a couple of useful string functions. (DO NOT MERGE)
Change-Id: I158f69917bab5f15482dd8f2b66b36a4cc0f11ad
(cherry picked from commit 5ee915afe1)
2014-06-09 21:30:16 +00:00
Mathieu Chartier 08511d6e31 Make host ashmem_create_region seed only once.
Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.

Bug: 15394258

(cherry picked from commit 1104ae8cfc)

Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
2014-06-06 16:51:11 -07:00
Dave Allison b311ca9ee8 Add LD_PRELOAD for libsigchain.so to the environment
To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment.  This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.

Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
2014-06-02 15:54:28 -07:00
Jeff Sharkey 2e7d80d10a Per-app media directories on external storage.
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I6f03d8076a9391d8b9eb8421ec3fc93669b3ba0d
2014-05-30 16:28:49 -07:00
Eric Laurent d502cb3483 DO NOT MERGE - audio: added definitions for audio routing extensions
Added definitons and structures for new audio routing features
in the framework and audio HAL.
The structures describe the objects needed to perform audio
routing and audio gain control: different variants of audio ports
and their corresponding configurations as well as gain controllers.

Change-Id: Iecd1b9186831067a52cc55619a63b7bba57dcbd9
2014-05-28 13:52:02 -07:00
The Android Automerger e3e04a16fd merge in master-release history after reset to 3db03a5ab0 2014-05-22 07:22:41 -07:00
The Android Automerger aef4743b80 merge in master-release history after reset to 3db03a5ab0 2014-05-22 05:51:12 -07:00
Todd Poynor 3db03a5ab0 healthd: Set fixed battery level and temperature via properties
setprop persist.sys.battery.capacity 77
setprop persist.sys.battery.temperature 123

and reboot to cause a fixed battery level of 77% and temperature of 12.3C
to be reported to Android.

Typically used on power evaluation boards without batteries connected.

Bug: 14839868
Change-Id: Ibae5e16429d05891cb0787d74a2fe93b07013699
2014-05-22 01:56:15 +00:00
Lorenzo Colitti acc13d7b27 Merge "Support static IP config on Ethernet" 2014-05-22 01:49:59 +00:00
Elliott Hughes 879715333a am b7fdf4fa: am 4077acd2: am 21be143a: Merge "Fix register dump and back trace after a crash."
* commit 'b7fdf4fa82ca8c7446434df65562e833f4dac986':
  Fix register dump and back trace after a crash.
2014-05-22 00:33:58 +00:00
Mark Salyzyn 51d65e6db9 am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""
* commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b':
  Revert "libnetutils: Turn on -Werror"
2014-05-22 00:33:57 +00:00
Mark Salyzyn fd04f91dff am d7465194: am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"
* commit 'd746519443e37d7dde104779253830e92ae72c8e':
  libnetutils: Turn on -Werror
2014-05-22 00:33:56 +00:00
Elliott Hughes b7fdf4fa82 am 4077acd2: am 21be143a: Merge "Fix register dump and back trace after a crash."
* commit '4077acd2c4e1efff0ad0942b54077b14859b06c1':
  Fix register dump and back trace after a crash.
2014-05-22 00:27:51 +00:00
Mark Salyzyn 2a7ce0bc7d am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""
* commit '9a12e952b3e765e03130ca1ab8bfe1b67d765e1b':
  Revert "libnetutils: Turn on -Werror"
2014-05-22 00:27:49 +00:00
Mark Salyzyn d746519443 am 2c0a7f6f: am d3cd08f8: Merge "libnetutils: Turn on -Werror"
* commit '2c0a7f6fd9145ce9499cd7c25f7f19ec6150c2ee':
  libnetutils: Turn on -Werror
2014-05-22 00:27:48 +00:00
Jaewan Kim 373d9fa082 Support static IP config on Ethernet
Bug: 7606609
Bug: 8687763
Change-Id: I1d76b5783e8511a8e3f5d981e6b4b9fb4fbecdf4
2014-05-22 00:00:35 +00:00
Elliott Hughes 4077acd2c4 am 21be143a: Merge "Fix register dump and back trace after a crash."
* commit '21be143a0e4c1b24a6a5a3b5a681c570d63b2525':
  Fix register dump and back trace after a crash.
2014-05-21 23:52:44 +00:00
Elliott Hughes 21be143a0e Merge "Fix register dump and back trace after a crash." 2014-05-21 23:41:58 +00:00
Douglas Leung 6254f32f21 Fix register dump and back trace after a crash.
Change-Id: Ie5f6624b9dcf81d84769b9cdaf9d8a301c8826f7
Signed-off-by: Douglas Leung <douglas@mips.com>
2014-05-21 16:41:20 -07:00
Mark Salyzyn 9a12e952b3 am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""
* commit '5b7bb03ee84185bd83a594569264cc3841b80749':
  Revert "libnetutils: Turn on -Werror"
2014-05-21 22:46:12 +00:00
Mark Salyzyn 2c0a7f6fd9 am d3cd08f8: Merge "libnetutils: Turn on -Werror"
* commit 'd3cd08f831be240342a2364160e5a537d3795f22':
  libnetutils: Turn on -Werror
2014-05-21 22:46:12 +00:00
Mark Salyzyn 5b7bb03ee8 Merge "Revert "libnetutils: Turn on -Werror"" 2014-05-21 22:17:14 +00:00
Mark Salyzyn 07dde4c314 Revert "libnetutils: Turn on -Werror"
This reverts commit 249c26de82.

Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
2014-05-21 22:14:38 +00:00
Mark Salyzyn d3cd08f831 Merge "libnetutils: Turn on -Werror" 2014-05-21 21:55:29 +00:00
Mark Salyzyn d6a657c81d am eb075e28: am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"
* commit 'eb075e28acff23804ef80d34cd08c5df9b1d583f':
  libdiskconfig: Turn on -Werror
2014-05-21 21:19:27 +00:00
Mark Salyzyn eb075e28ac am c8179498: am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"
* commit 'c8179498225dc44350c3addc932be97a9ef3a941':
  libdiskconfig: Turn on -Werror
2014-05-21 21:12:18 +00:00
Mark Salyzyn c817949822 am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"
* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
  libdiskconfig: Turn on -Werror
2014-05-21 21:08:23 +00:00
Mark Salyzyn 2f62edf77d Merge "libdiskconfig: Turn on -Werror" 2014-05-21 21:00:53 +00:00
Colin Cross 6fb1557fda am b696bec3: am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"
* commit 'b696bec3541dc3091fb7c8764750f8ba21f64636':
  Modify VID for Compal
2014-05-21 20:49:01 +00:00
Mark Salyzyn 249c26de82 libnetutils: Turn on -Werror
Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
2014-05-21 12:58:37 -07:00
Mark Salyzyn 42c79fe18b libdiskconfig: Turn on -Werror
Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
2014-05-21 12:58:37 -07:00
Colin Cross b696bec354 am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"
* commit '28c305183a6596eb3241771422d22351fbeaa9fb':
  Modify VID for Compal
2014-05-21 19:32:15 +00:00
Colin Cross 28c305183a am 1742b7d2: Merge "Modify VID for Compal"
* commit '1742b7d218706c596e6b40c89a6660f30bdba022':
  Modify VID for Compal
2014-05-21 19:28:43 +00:00
Colin Cross 1742b7d218 Merge "Modify VID for Compal" 2014-05-21 19:24:53 +00:00
Greg Hackmann e12dd29755 am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"
* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build
2014-05-21 18:20:55 +00:00
Greg Hackmann ac239a915b am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"
* commit '376aebdc9d92efed4928523227381ea18a4cb0cc':
  toolbox: fix x86 build
2014-05-21 18:18:00 +00:00
Greg Hackmann 376aebdc9d am 76d057b9: Merge "toolbox: fix x86 build"
* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
  toolbox: fix x86 build
2014-05-21 18:13:18 +00:00
Greg Hackmann 4dc379b59b am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"
* commit '5d93823e557834c9b17771241ea6eecad74a5749':
  toolbox: fix build
2014-05-21 18:10:38 +00:00
Greg Hackmann 76d057b970 Merge "toolbox: fix x86 build" 2014-05-21 18:10:31 +00:00
Sreeram Ramachandran f76d8a88a1 am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client into netd."
* commit '02c723579d0ee4e06da59cd58b579ff8ff76965e':
  Move netd_client into netd.
2014-05-21 18:10:21 +00:00
Greg Hackmann 2122aac5c9 toolbox: fix x86 build
Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 11:04:32 -07:00
Greg Hackmann 5d93823e55 am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"
* commit '153c7aabdc1de609188ce2441442f985f75d4399':
  toolbox: fix build
2014-05-21 17:49:28 +00:00
Greg Hackmann 153c7aabdc am 5eedd9d6: Merge "toolbox: fix build"
* commit '5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3':
  toolbox: fix build
2014-05-21 17:46:12 +00:00
Greg Hackmann 5eedd9d62f Merge "toolbox: fix build" 2014-05-21 17:43:10 +00:00
Greg Hackmann eeed45fa24 toolbox: fix build
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 10:39:44 -07:00
Mark Salyzyn 6cd488e95a resolved conflicts for merge of faf84529 to master
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
2014-05-21 10:07:55 -07:00
Sreeram Ramachandran 02c723579d am f8733c63: am 08c08f72: Merge "Move netd_client into netd."
* commit 'f8733c63aa7b7de8350264295a2c2c080b5307a4':
  Move netd_client into netd.
2014-05-21 17:04:15 +00:00
Sreeram Ramachandran f8733c63aa am 08c08f72: Merge "Move netd_client into netd."
* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
  Move netd_client into netd.
2014-05-21 17:01:39 +00:00
Sreeram Ramachandran 08c08f7261 Merge "Move netd_client into netd." 2014-05-21 16:59:51 +00:00
Sreeram Ramachandran 91dc3369d3 Move netd_client into netd.
(cherry picked from commit f1b21c5c73)

Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
2014-05-21 09:26:57 -07:00