Elliott Hughes
6f1f6985eb
Merge "Mac OS has included dladdr(3) since at least 10.4."
2012-05-24 17:16:48 -07:00
Eric Laurent
94bb0acd17
am 27ca5f14
: am 88f11846
: audio policy: allow disabling A2DP for media.
...
* commit '27ca5f14939e763426b8bb1f67d08a39ddcef958':
audio policy: allow disabling A2DP for media.
2012-05-24 11:47:39 -07:00
Eric Laurent
27ca5f1493
am 88f11846
: audio policy: allow disabling A2DP for media.
...
* commit '88f11846a621b148387aa09754bc939933793717':
audio policy: allow disabling A2DP for media.
2012-05-24 11:42:54 -07:00
Eric Laurent
88f11846a6
audio policy: allow disabling A2DP for media.
...
Added FORCE_NO_BT_A2DP forced use to allow applications to
override default policy to use A2DP whenever connected.
Bug 6485897.
Change-Id: I0039232ea6cce4121f375961b2c153d1a0d92e49
2012-05-24 10:10:45 -07:00
The Android Open Source Project
14cea26aa6
am c79e59ce
: Reconcile with jb-release
...
* commit 'c79e59ce77f30a6da1bb04773f7f63446b378d0b':
2012-05-24 09:08:24 -07:00
The Android Open Source Project
c79e59ce77
Reconcile with jb-release
...
Change-Id: I76ffcc7449cf140d5598612a6be3e8f7b964dc9b
2012-05-24 09:01:53 -07:00
The Android Automerger
75d2a79001
merge in jb-release history after reset to jb-dev
2012-05-24 07:02:51 -07:00
Elliott Hughes
5817b03323
Mac OS has included dladdr(3) since at least 10.4.
...
This is needed by libcorkscrew.
Change-Id: Iacc56b014398da195b33c3cebc420afe6044381c
2012-05-23 17:05:11 -07:00
Irfan Sheriff
458409c2bd
am e4cd4512
: am ddf07b41
: Merge "Reuse system properties for p2p" into jb-dev
...
* commit 'e4cd4512d684c23a31fbb91c65e2283d7c16d415':
Reuse system properties for p2p
2012-05-23 14:21:55 -07:00
Irfan Sheriff
e4cd4512d6
am ddf07b41
: Merge "Reuse system properties for p2p" into jb-dev
...
* commit 'ddf07b41167bbcb4e74d0af5dd43175513963c2d':
Reuse system properties for p2p
2012-05-23 14:19:27 -07:00
Irfan Sheriff
ddf07b4116
Merge "Reuse system properties for p2p" into jb-dev
2012-05-23 14:17:02 -07:00
Irfan Sheriff
89f58cf827
Reuse system properties for p2p
...
p2p interfaces keep increasing. Reuse a single "p2p" phrase to track all
p2p specific properties.
Longer term, we will remove the use of system properties for dhcp
Also, fixed some warnings
Bug: 6522164
Change-Id: Ibe9a68a1b5db9d5b0fe88c854d9f94b1b9930970
2012-05-23 14:13:40 -07:00
Elliott Hughes
6b659aec2e
Fix a leak I caused in the libcorkscrew test program.
...
Change-Id: Iecbe006721d462694d48f32bca1606443b9c9714
2012-05-22 16:02:35 -07:00
Elliott Hughes
cdc6d77beb
Merge "Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc)."
2012-05-21 15:18:56 -07:00
The Android Open Source Project
cdedc3e3de
am 8141498d
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '8141498d2d30ed62183fc790b152f4f6058881fd':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
2012-05-21 14:29:06 -07:00
Elliott Hughes
6b3bab39d1
Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc).
...
Longer term, we might want to offer <ucontext.h> and have that be like glibc's,
but not today. (Note that POSIX says nothing about mcontext_t and glibc,
Mac OS, and the Linux kernel headers are all mutually incompatible.)
Change-Id: Ia074b51f4567cd54e06bbe29721389c8d1278614
2012-05-21 13:59:52 -07:00
The Android Open Source Project
8141498d2d
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I1f460af608d091f5e9fddcab2953817fee7eec43
2012-05-18 18:44:12 -07:00
Elliott Hughes
04607b8aa9
Test libcorkscrew's ELF symbol table decoder too.
...
Change-Id: I3180ffe07b44245c698dd03a789a3b337f32872a
2012-05-18 16:53:22 -07:00
Elliott Hughes
71363a8075
Support libcorkscrew on x86 hosts in binaries using glibc.
...
Change-Id: I1f2b7f21cc7f8227dbe7d294fed88cb691a24d09
2012-05-18 15:50:54 -07:00
The Android Automerger
2240bbe647
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:50:50 -07:00
Elliott Hughes
b7fa1fc12d
Merge "Add missing #includes."
2012-05-18 10:14:54 -07:00
Elliott Hughes
420a7fa82d
Add missing #includes.
...
Change-Id: I81405d638f80fc96874ea0b21af3538229aa38a7
2012-05-17 18:28:01 -07:00
Jean-Baptiste Queru
3449836bc5
am 5820a99f
: Fix build
...
* commit '5820a99f3f843d718e80bc34bc4879144cce1efe':
Fix build
2012-05-17 17:17:54 -07:00
Colin Cross
5a252a0385
am bbea1446
: am 4c48025c
: Increase cpu.rt_runtime_us to 10% for fg and bg groups
...
* commit 'bbea14468edef1b00355478ed094031e70479263':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
2012-05-17 15:33:03 -07:00
Jean-Baptiste Queru
5820a99f3f
Fix build
...
Change-Id: Ie2af6aab7e236c31bb7a607659813218ef9c5400
2012-05-16 16:56:57 -07:00
Colin Cross
90dbf7a87e
Increase cpu.rt_runtime_us to 10% for fg and bg groups
...
GPS on yakju puts SCHED_RR threads in the fg and bg groups, and
is unhappy with 0.1% limits. Increase the limits to 10%.
Change-Id: I971c9b0a815890d41694b965fdd2b023937a4411
2012-05-16 15:52:08 -07:00
Colin Cross
bbea14468e
am 4c48025c
: Increase cpu.rt_runtime_us to 10% for fg and bg groups
...
* commit '4c48025c484e9fb0e10bb9c6a1b9bbd5a2def555':
Increase cpu.rt_runtime_us to 10% for fg and bg groups
2012-05-16 14:22:53 -07:00
Colin Cross
4c48025c48
Increase cpu.rt_runtime_us to 10% for fg and bg groups
...
GPS on yakju puts SCHED_RR threads in the fg and bg groups, and
is unhappy with 0.1% limits. Increase the limits to 10%.
Change-Id: I971c9b0a815890d41694b965fdd2b023937a4411
2012-05-16 13:49:30 -07:00
The Android Open Source Project
62cf8f1c40
am 5e8f8596
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '5e8f859631f6de0e0b312011771f06e9ead10747':
Increase rt_runtime_us to 1000 for foreground and bg_non_interactive
change /fstab.* perms back to 0644, to unbreak incremental OTAs
2012-05-16 08:46:22 -07:00
The Android Open Source Project
5e8f859631
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I988b644a8fc479af57a19dc947fbb1075e5bc515
2012-05-16 08:41:16 -07:00
Xavier Ducrohet
678cc32980
am c7a67d0f
: resolved conflicts for merge of 246808be
to jb-dev-plus-aosp
...
* commit 'c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690':
Add USB Vendor ID for Yulong Coolpad.
2012-05-15 11:29:59 -07:00
Xavier Ducrohet
c7a67d0fc4
resolved conflicts for merge of 246808be
to jb-dev-plus-aosp
...
Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
2012-05-15 10:44:29 -07:00
The Android Automerger
1f956d3ecc
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-15 09:36:41 -07:00
The Android Automerger
ccd0503137
merge in jb-release history after reset to jb-dev
2012-05-15 07:07:13 -07:00
Xavier Ducrohet
246808bedf
Add USB Vendor ID for Yulong Coolpad.
...
Bug: 6217375
Change-Id: I8931c42e8d3088cc4df8c6e56b323a7392cad5ef
2012-05-14 15:00:25 -07:00
Jean-Baptiste Queru
51a958645c
am 9dbcbe08
: am 9bdedb59
: am a36e1aa3
: Merge "adb: usb_windows: fix adb connection lost issue"
...
* commit '9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3':
adb: usb_windows: fix adb connection lost issue
2012-05-14 08:37:37 -07:00
Jeff Brown
b6416ff30d
am 94cb7adb
: am bee7ce20
: Merge "Delete dead code." into jb-dev
...
* commit '94cb7adb899fdfa9b5b6aa8b8dff4ae01631087f':
Delete dead code.
2012-05-14 08:37:18 -07:00
Todd Poynor
8ae4cb151b
am 7c7a55ee
: am 50efaf2f
: Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev
...
* commit '7c7a55ee82e666cc9279ab3e2a7022ccde52e2e6':
init: Set perms for interactive cpufreq governor boostpulse
2012-05-14 08:35:51 -07:00
JP Abgrall
3447b11d3e
am 177a74ac
: am c1f88106
: Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev
...
* commit '177a74aced971b89c319fb61ee12da0ca40f0c12':
fastboot: Change -w to format after the erase of userdata & cache
2012-05-14 08:35:13 -07:00
The Android Automerger
b0c4d53502
merge in jb-release history after reset to jb-dev
2012-05-14 07:06:20 -07:00
Jean-Baptiste Queru
9dbcbe0875
am 9bdedb59
: am a36e1aa3
: Merge "adb: usb_windows: fix adb connection lost issue"
...
* commit '9bdedb599874278abf206230ed31010eeb9b40dd':
adb: usb_windows: fix adb connection lost issue
2012-05-11 21:58:10 -07:00
Jean-Baptiste Queru
9bdedb5998
am a36e1aa3
: Merge "adb: usb_windows: fix adb connection lost issue"
...
* commit 'a36e1aa3db254d008f220a45899e1d70f4192619':
adb: usb_windows: fix adb connection lost issue
2012-05-11 21:55:00 -07:00
Jeff Brown
94cb7adb89
am bee7ce20
: Merge "Delete dead code." into jb-dev
...
* commit 'bee7ce20a5dad8b04075b3ec6a2ff0dc5d2d0cea':
Delete dead code.
2012-05-11 19:35:18 -07:00
Jeff Brown
bee7ce20a5
Merge "Delete dead code." into jb-dev
2012-05-11 19:32:43 -07:00
Jeff Brown
1ee467c760
Delete dead code.
...
This file is not compiled and not used.
Bug: 6435382
Change-Id: I3a08690950f1c77f8b0bc57a9e5cdb6eb402ac77
2012-05-11 17:35:16 -07:00
Todd Poynor
7c7a55ee82
am 50efaf2f
: Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev
...
* commit '50efaf2f7fc87692649497dba5615e54efd9c637':
init: Set perms for interactive cpufreq governor boostpulse
2012-05-11 15:55:59 -07:00
Todd Poynor
50efaf2f7f
Merge "init: Set perms for interactive cpufreq governor boostpulse" into jb-dev
2012-05-11 15:54:13 -07:00
JP Abgrall
177a74aced
am c1f88106
: Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev
...
* commit 'c1f881069de19dfa52aaa4cb06e8b3912c2ad61a':
fastboot: Change -w to format after the erase of userdata & cache
2012-05-11 15:30:33 -07:00
JP Abgrall
c1f881069d
Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev
2012-05-11 15:28:45 -07:00
Jean-Baptiste Queru
a36e1aa3db
Merge "adb: usb_windows: fix adb connection lost issue"
2012-05-11 14:47:20 -07:00