c5333e494d
am 1dc92bac: am 207c17ff: Merge "Make adb robust against EINTR"
...
* commit '1dc92bacb8cbf052438e0b1af4030a57901d6e94':
Make adb robust against EINTR
2012-10-13 00:01:37 -07:00
1dc92bacb8
am 207c17ff: Merge "Make adb robust against EINTR"
...
* commit '207c17ff1f48d0db3c69628bb036a14db40b5887':
Make adb robust against EINTR
2012-10-12 23:59:22 -07:00
207c17ff1f
Merge "Make adb robust against EINTR"
2012-10-12 23:45:47 -07:00
bb10d89a54
am 657cd838: am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank
...
* commit '657cd83899355c7f488dcd3294a523ec120f840f':
charger: allow devices to skip the initial display blank
2012-10-12 15:55:47 -07:00
657cd83899
am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank
...
* commit '9b4a9312dc1c158ae28ce3f3a2f6ebf16fd94ff1':
charger: allow devices to skip the initial display blank
2012-10-12 15:53:48 -07:00
9b4a9312dc
am 209c7b0f: charger: allow devices to skip the initial display blank
...
* commit '209c7b0fad9604d1dde1b74d9f9d577b923469fd':
charger: allow devices to skip the initial display blank
2012-10-12 15:52:07 -07:00
73167412bc
Make adb robust against EINTR
...
Change-Id: I39a8d9007ce2d5662a33a50e4d7e2e7f8f9fad63
2012-10-12 15:28:37 -07:00
209c7b0fad
charger: allow devices to skip the initial display blank
...
The theory behind the blank was that the kernel would not
re-initilize the display on boot (and leave it to whatever
the bootloader configured it to) until after the first
blank request.
On some devices, the bootloader does not turn the screen on,
but it's done by the kernel and thus. This makes the extra blank at
start unnecessary.
Bug: 7319529
Change-Id: I9ad9856186df6e9e23ebbe86e83b641423e16dcb
Signed-off-by: Dima Zavin <dima@android.com>
2012-10-12 15:13:52 -07:00
c189f4a026
am e34e9e49: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
...
* commit 'e34e9e498ac6910fc7c9a34aca010febcc750e7f':
2012-10-12 07:33:41 -07:00
e34e9e498a
Reconcile with jb-mr1-factory-release - do not merge
...
Change-Id: I8c44904def148550022af390ceda87a2d4007c48
2012-10-12 07:32:27 -07:00
32429a93d4
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:19:56 -07:00
baca80b57b
am 436faffe: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '436faffe3c99955eee2ccd9df3e0b2cd1510c01c':
2012-10-11 08:08:29 -07:00
436faffe3c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I7ec0e7696f2f2004f75d5b83f86ea6d890e0cd3d
2012-10-11 08:06:18 -07:00
f3f1d01675
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:04:29 -07:00
f638b7e0a0
am e47eb98a: am 674c0445: Merge "toolbox: silence some compiler warnings"
...
* commit 'e47eb98a337081d0d6c740eb7d8b990faf4090d7':
toolbox: silence some compiler warnings
2012-10-11 00:30:23 -07:00
e47eb98a33
am 674c0445: Merge "toolbox: silence some compiler warnings"
...
* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
toolbox: silence some compiler warnings
2012-10-11 00:29:10 -07:00
674c0445e2
Merge "toolbox: silence some compiler warnings"
2012-10-11 00:03:53 -07:00
3253f42c69
am 41f0e1a7: am f1bb0a95: am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack
...
* commit '41f0e1a725994fe458f6859e8c72df17af84b3fd':
Change dev/uhid group id from bluetooth to net_bt_stack
2012-10-10 15:42:34 -07:00
41f0e1a725
am f1bb0a95: am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack
...
* commit 'f1bb0a95b91a8a75c7ca653a40bb56f1122afbba':
Change dev/uhid group id from bluetooth to net_bt_stack
2012-10-10 15:40:47 -07:00
f1bb0a95b9
am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack
...
* commit 'bdec5ead7417769ba9fc75b6ca86d191b49f2be8':
Change dev/uhid group id from bluetooth to net_bt_stack
2012-10-10 15:38:52 -07:00
bdec5ead74
Change dev/uhid group id from bluetooth to net_bt_stack
...
Secondary user need that group id to access the file to support hid
bug 7315419
Change-Id: I9d2d3d5a5114d289dc4d83c697421622db4beae6
2012-10-10 15:18:28 -07:00
ef5d0340e4
toolbox: silence some compiler warnings
...
Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.
Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
2012-10-10 11:28:27 -07:00
d81cf9e746
am 1595c5a8: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '1595c5a8b8b6dc2dddcc79c2fa8239914125b124':
2012-10-10 09:48:02 -07:00
1595c5a8b8
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I3f20206be34b065992e47210bf5a10b3c4bfcfb9
2012-10-10 09:46:03 -07:00
7f9349da1f
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 09:04:30 -07:00
035649eb10
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:55 -07:00
a0941d2c81
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:28 -07:00
bd0816f54b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 15:39:30 -07:00
1311d48b0d
am 90b53007: am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev
...
* commit '90b530070ad49d49844fe82ab674b5f1093b80a6':
audio policy: add forced uses for system
2012-10-09 11:34:31 -07:00
90b530070a
am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev
...
* commit '074f11c21da1f6897a750125e87cc478c0e983ee':
audio policy: add forced uses for system
2012-10-09 11:32:31 -07:00
074f11c21d
am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev
...
* commit 'd22b2a1f35153058bbc5ce664fc9740adda8bcb7':
audio policy: add forced uses for system
2012-10-09 11:30:54 -07:00
d22b2a1f35
Merge "audio policy: add forced uses for system" into jb-mr1-dev
2012-10-09 11:28:23 -07:00
4daa843432
audio policy: add forced uses for system
...
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.
Bug 7032634.
Change-Id: Ib1834ec507f3aa726895b8fd3e8a91cc9cc601a7
2012-10-09 09:39:03 -07:00
1fcda03919
am 6c631f7a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '6c631f7a4d5b26d21059ae9ec58f84be1421f27e':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-09 07:35:34 -07:00
6c631f7a4d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I71bc832ed089ae690aecfc96672986fc09712a58
2012-10-09 07:31:04 -07:00
fb2f28271b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 07:00:02 -07:00
a675e56040
am 9b40be2a: am a6b429d4: am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
...
* commit '9b40be2a6e04ec82e9e3c24880a8bced446ecfda':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
2012-10-08 11:34:17 -07:00
9b40be2a6e
am a6b429d4: am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
...
* commit 'a6b429d4f19aead36a04f0103a2bd687f5ccaeb8':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
2012-10-08 11:32:46 -07:00
a6b429d4f1
am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
...
* commit 'c6f8bd396614d422d80ac9f24c91fa44a713894a':
rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
2012-10-08 11:31:28 -07:00
c6f8bd3966
Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
2012-10-08 11:30:36 -07:00
33978c4283
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
...
Some Android programs have problems with memory which grows
from the top down. Temporarily set ADDR_COMPAT_LAYOUT to
avoid breaking those programs.
Bug: 7188322
Change-Id: I61760500e670b4563838c63b82d4a0b6e354a86e
2012-10-05 15:16:57 -07:00
87980b5c9f
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
...
This reverts commit 01b1dee0ab
2012-10-05 12:45:05 -07:00
00b7cefaf6
am 569182a2: am 7f3de6a4: am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
...
* commit '569182a2ab059c41524f4ba3798e18fd9165c2b6':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-05 12:15:29 -07:00
569182a2ab
am 7f3de6a4: am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
...
* commit '7f3de6a450f025245bb27fdc13f5bbc1dc22624d':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-05 12:14:11 -07:00
7f3de6a450
am d282dfc4: Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
...
* commit 'd282dfc4e9bd5b5479511eb4ffdf64407606dc40':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
2012-10-05 12:12:35 -07:00
d282dfc4e9
Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
2012-10-05 12:10:38 -07:00
01b1dee0ab
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
...
Some Android programs have problems with memory which grows
from the top down. Temporarily set ADDR_COMPAT_LAYOUT to
avoid breaking those programs.
Bug: 7188322
Change-Id: I61760500e670b4563838c63b82d4a0b6e354a86e
2012-10-05 12:02:46 -07:00
f39be6b58a
am e21cbe0d: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e21cbe0db2b3afa39be9f65ec0bc7aea7ed2d0dc':
2012-10-05 08:20:48 -07:00
e21cbe0db2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I01fd1df9c6d8814ac0a8a92da1f04ca21c6779cb
2012-10-05 08:18:38 -07:00
6fe9240d8c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 07:00:32 -07:00
Kenny Root