Wink Saville
4e803c3c18
Merge "Add log group to rild to improve log collection on modem issue"
2011-10-10 12:24:48 -07:00
Jeffrey Tinker
ccc79022e1
am f791e17b: Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls"
...
* commit 'f791e17bc94e1308245bf8bf16d1d98e7fd9dcda':
Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls
2011-10-07 19:42:14 -07:00
Jeffrey Tinker
f791e17bc9
Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls"
2011-10-07 19:40:35 -07:00
Wu-cheng Li
da950f772b
am bc76bb45: Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."
...
* commit 'bc76bb458220f39ed290e2d13180c31bb35ecb90':
Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.
2011-10-07 05:46:36 -07:00
Wu-cheng Li
bc76bb4582
Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."
2011-10-07 03:08:30 -07:00
Wu-cheng Li
8d43cb6edb
Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.
...
bug:5422679
Change-Id: Ia4a09328bd9e1d36af680be4d065bc08cf0dec0f
2011-10-07 17:19:18 +08:00
Jeffrey Tinker
65c4df51f8
Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls
...
Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS
Change-Id: Iacfe3e79f067172085b96bb4cd4484101aa5be1e
2011-10-06 18:19:46 -07:00
Kenny Root
2f1e0f450b
am ce020a72: Merge "Add checking for log entry format"
...
* commit 'ce020a72e78408bc66bbd06993d6a24122846610':
Add checking for log entry format
2011-10-05 13:02:49 -07:00
Kenny Root
ce020a72e7
Merge "Add checking for log entry format"
2011-10-05 13:01:48 -07:00
Christopher Tate
a3cb8ec123
am 114f2421: Merge "Add command line help for the new \'adb backup -all -nosystem\'"
...
* commit '114f2421fef49d5312763c3c0d6804e096df77e9':
Add command line help for the new 'adb backup -all -nosystem'
2011-10-04 16:18:22 -07:00
Christopher Tate
114f2421fe
Merge "Add command line help for the new 'adb backup -all -nosystem'"
2011-10-04 16:16:14 -07:00
Jeffrey Tinker
5900eaf04c
am 134959a6: Merge "Create drmrpc group for security services"
...
* commit '134959a621ab03232f08d8ce6198e6a578311022':
Create drmrpc group for security services
libnl_2: Fix nested attribute setting
2011-10-04 10:57:01 -07:00
Jeffrey Tinker
134959a621
Merge "Create drmrpc group for security services"
2011-10-04 10:53:47 -07:00
Christopher Tate
56885094b6
Add command line help for the new 'adb backup -all -nosystem'
...
Documentation-only change that supports the new framework-side
feature to omit system packages when you're using adb backup -all.
Bug 5361503.
Change-Id: I86bca8883a7fb8c713ca352ad5980e92fd640d18
2011-10-03 18:27:01 -07:00
Kenny Root
4bf3c02e02
Add checking for log entry format
...
The log tag may be zero length if corrupted, so check for this
condition.
Change-Id: I7616226dabe78a85859b0ab53aca08f734dbdd84
2011-10-03 14:14:41 -07:00
Dmitry Shmidt
2a51ec8dd7
am e5de9ee4: libnl_2: Fix getting family_id
...
* commit 'e5de9ee4915bafd7f31a96260613d8b93aba8351':
libnl_2: Fix getting family_id
2011-09-30 14:21:04 -07:00
Jeffrey Tinker
7005c03754
Create drmrpc group for security services
...
Bug 4598045
Change-Id: I5550203927146fd6864408b3ac2f5e6f5d2b1d77
2011-09-30 12:40:25 -07:00
Dmitry Shmidt
e5de9ee491
libnl_2: Fix getting family_id
...
Change-Id: I27b2495fb96852e960f647f032a5fcd446ec742b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-09-30 12:39:48 -07:00
Kazuhiro Ondo
e65e946382
Add log group to rild to improve log collection on modem issue
...
Add log group to ril-daemon service. rild is the best place to
know the issue on the modem in many time. It would be helpful
if rild alone can capture the snapshot of logcat buffers at
the moment of problem.
Change-Id: Ie0dcda126fb748a00e650427de35541672359287
2011-09-30 11:53:09 -07:00
Dima Zavin
334ea78110
am db982b06: am 73531557: Revert "charger: show animation when the device is unplugged"
...
* commit 'db982b06606e885186efc1ee32c9dd96216c12dc':
Revert "charger: show animation when the device is unplugged"
2011-09-30 11:25:39 -07:00
Dima Zavin
700500a881
am 01851eac: am 823ebc4d: charger: dump the last_kmsg when going into charger mode
...
* commit '01851eac692286bcd842abf5c4f50654e3a4100c':
charger: dump the last_kmsg when going into charger mode
2011-09-30 11:25:38 -07:00
Dima Zavin
db982b0660
am 73531557: Revert "charger: show animation when the device is unplugged"
...
* commit '7353155717ec56e119a125cd6492c19df755b6ea':
Revert "charger: show animation when the device is unplugged"
2011-09-30 11:23:28 -07:00
Dima Zavin
01851eac69
am 823ebc4d: charger: dump the last_kmsg when going into charger mode
...
* commit '823ebc4d824ea70e5ec7d376adf2fbce50eb9cb2':
charger: dump the last_kmsg when going into charger mode
2011-09-30 11:23:27 -07:00
David Turner
1b3e16ad98
am 9892aa5d: Merge "Fix SocketListener socket leak issue."
...
* commit '9892aa5d041132f1048f6707e09a434c25f06862':
Fix SocketListener socket leak issue.
2011-09-30 05:46:17 -07:00
David Turner
9892aa5d04
Merge "Fix SocketListener socket leak issue."
2011-09-29 18:44:18 -07:00
Dima Zavin
7353155717
Revert "charger: show animation when the device is unplugged"
...
This reverts commit e0c70dad4b
.
2011-09-29 17:27:37 -07:00
Dima Zavin
823ebc4d82
charger: dump the last_kmsg when going into charger mode
...
Change-Id: I3b76bb5071d8a44adfb221774bb304bf296c8c1b
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-29 17:20:44 -07:00
Lorenzo Colitti
aa51962f6f
am 15c8c3eb: Merge "Support adding, deleting, and clearing IPv6 addrs."
...
* commit '15c8c3ebf060c57cb165322cd498958cf9112d8b':
Support adding, deleting, and clearing IPv6 addrs.
2011-09-29 09:06:56 -07:00
Lorenzo Colitti
15c8c3ebf0
Merge "Support adding, deleting, and clearing IPv6 addrs."
2011-09-29 09:04:23 -07:00
Xianzhu Wang
4520246d35
Fix SocketListener socket leak issue.
...
The problem was: if a socket is shared between SocketListener and another
thread, only if the last reference is removed by SocketListener can the socket
be closed, otherwise the socket will leak. This sometimes happens in netd's
dnsproxyd.
This change let the SocketClient own the socket and close the socket when
the SocketClient is destructed.
Change-Id: I2865fbfe9ee4d8b3e43d7e02919dbb2d261f70de
2011-09-29 13:42:32 +08:00
Lorenzo Colitti
47ddb515b7
Support adding, deleting, and clearing IPv6 addrs.
...
- Provide a function to add and delete IPv4/IPv6 addresses
using netlink.
- Provide a function that clears all IP addresses on an
interface that can be used by netd.
Also, a couple of cleanups:
- Update the header file to match reality, and include the
header file in the implementation. Also fix a caller that
has an incorrect method signature.
- Fix whitespace in Android.mk.
Change-Id: Ifba9d60cdfffb0b7e5c3b9c6ab328f5f77d259c4
2011-09-28 17:12:13 -07:00
Mathias Agopian
8d86b7d76b
am 2a32df25: Merge "enable HAVE_DLADDR, since... we have it"
...
* commit '2a32df25b8bb307693173911041458aaca84c84c':
enable HAVE_DLADDR, since... we have it
2011-09-28 15:18:08 -07:00
Mathias Agopian
2a32df25b8
Merge "enable HAVE_DLADDR, since... we have it"
2011-09-28 15:16:44 -07:00
Vladimir Chtchetkine
4496d12c0d
am b14bbf02: Merge "Pick up on androidboot.hardware kernel cmd option"
...
* commit 'b14bbf02980fdb87437c1054037fda09286be6a4':
Pick up on androidboot.hardware kernel cmd option
2011-09-28 12:55:51 -07:00
Vladimir Chtchetkine
b14bbf0298
Merge "Pick up on androidboot.hardware kernel cmd option"
2011-09-28 12:53:56 -07:00
Mathias Agopian
918638c775
enable HAVE_DLADDR, since... we have it
...
Change-Id: I02baa1f7d3383e93a43fa04de1d39f7398e971bc
2011-09-28 12:17:00 -07:00
Vladimir Chtchetkine
2b99543cef
Pick up on androidboot.hardware kernel cmd option
...
x86 emulator passes hardware name through the androidboot.hardware kernel cmd option, and
ueventd must pick up on it to locate proper ueventd.rc file for that hardware.
Change-Id: Id61c5b67fe6275a15c7aa62556e0b89eda7968f8
2011-09-28 11:44:30 -07:00
Jean-Baptiste Queru
80cb60d315
am ba8ea700: am c59c6c31: am 52262788: Ignore beec0066
from gingerbread (already here)
...
* commit 'ba8ea7002497ef7e8555a0fd58bbd7912f9a6c51':
emulator: allow /dev/qemu_pipe access
2011-09-28 10:49:11 -07:00
Jean-Baptiste Queru
ba8ea70024
am c59c6c31: am 52262788: Ignore beec0066
from gingerbread (already here)
...
* commit 'c59c6c31a7bb6c70dc8b4f2b2879db98cd617626':
emulator: allow /dev/qemu_pipe access
2011-09-28 10:47:47 -07:00
Jean-Baptiste Queru
c59c6c31a7
am 52262788: Ignore beec0066
from gingerbread (already here)
...
* commit '52262788834da375b88cb97b995b42c4ffde0f60':
emulator: allow /dev/qemu_pipe access
2011-09-28 10:45:55 -07:00
Jean-Baptiste Queru
5226278883
Ignore beec0066
from gingerbread (already here)
...
Change-Id: Id124f8c7288e464f76bdb531dd97e10d5a22244a
2011-09-28 10:40:43 -07:00
Dima Zavin
15278d1d33
am a5bfd4e3: am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%
...
* commit 'a5bfd4e3835b44296896da933ca9484441148ae3':
charger: use the new asset for almost full, and show full @ 95%
2011-09-26 19:50:22 -07:00
Dima Zavin
19496b833a
am df3429de: am fc44f5f4: charger: update assets
...
* commit 'df3429de1294de4b3cadfbfcca06e8c9dc4e090d':
charger: update assets
2011-09-26 19:50:22 -07:00
Dima Zavin
a5bfd4e383
am 1a5ca61b: charger: use the new asset for almost full, and show full @ 95%
...
* commit '1a5ca61b28b3269b625b7a7162b4f50734f7fea9':
charger: use the new asset for almost full, and show full @ 95%
2011-09-26 19:44:47 -07:00
Dima Zavin
df3429de12
am fc44f5f4: charger: update assets
...
* commit 'fc44f5f4d4b3b05d9eba1ee787b70e1dfe0f18c5':
charger: update assets
2011-09-26 19:44:46 -07:00
Dima Zavin
1a5ca61b28
charger: use the new asset for almost full, and show full @ 95%
...
Change-Id: I5f8729260ae068d35d981ff2c16d576c3d4dd82f
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-26 14:14:19 -07:00
Dima Zavin
fc44f5f4d4
charger: update assets
...
Change-Id: I0c0d1206fdc3aa30382a9ee86edb88bba1e21e63
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-26 13:57:45 -07:00
Dima Zavin
06d8d6a8a9
am d7802a2f: am e0c70dad: charger: show animation when the device is unplugged
...
* commit 'd7802a2fa4c5ebda3fe0becbd195479d13793a46':
charger: show animation when the device is unplugged
2011-09-26 13:16:52 -07:00
Dima Zavin
d7802a2fa4
am e0c70dad: charger: show animation when the device is unplugged
...
* commit 'e0c70dad4b4d417182e4c0ba8adae199f2622582':
charger: show animation when the device is unplugged
2011-09-26 13:14:56 -07:00
Dima Zavin
97eaf5a603
am dcecd4cc: resolved conflicts for merge of 0052abda
to master
...
* commit 'dcecd4cc775a2fdc0212a0a76b861ee987ec2ef3':
charger: update charger UI with official graphics and animation
2011-09-25 22:33:02 -07:00