The Android Automerger
86eeea5ce8
Revert "Merge "Remove log spam" into ics-mr0"
...
This reverts commit d4f29767c8 , reversing
changes made to 604f52e313 .
2011-11-02 21:04:09 -07:00
The Android Automerger
23420745e2
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 20:53:30 -07:00
The Android Automerger
6641b39923
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
...
This reverts commit 4f7c0843bb , reversing
changes made to 6fb3df8d46 .
2011-11-02 10:18:15 -07:00
The Android Automerger
fa792b19cc
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
...
This reverts commit 6fb3df8d46 , reversing
changes made to d4f29767c8 .
2011-11-02 10:18:01 -07:00
The Android Automerger
77aa295272
Revert "Merge "Remove log spam" into ics-mr0"
...
This reverts commit d4f29767c8 , reversing
changes made to 604f52e313 .
2011-11-02 10:17:46 -07:00
The Android Automerger
df241e54ae
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 09:48:57 -07:00
The Android Automerger
6d9f02302d
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
...
This reverts commit 4f7c0843bb , reversing
changes made to 6fb3df8d46 .
2011-11-02 04:41:24 -07:00
Dmitry Shmidt
4f7c0843bb
Merge "libnl_2: Fix memory leaks" into ics-mr0
2011-11-01 17:12:02 -07:00
Dmitry Shmidt
d99fe5ec96
libnl_2: Fix memory leaks
...
BUG: b/5532633
Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-11-01 15:56:22 -07:00
Dima Zavin
6fb3df8d46
Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0
2011-11-01 15:28:42 -07:00
Irfan Sheriff
d4f29767c8
Merge "Remove log spam" into ics-mr0
2011-11-01 13:17:53 -07:00
Dima Zavin
9ec3f3e2e4
charger: make the almost-full frame only show when it's current level
...
Change-Id: Id53de101dd3c211d376abfd748e7646e28291749
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-31 17:04:33 -07:00
Irfan Sheriff
477df68854
Remove log spam
...
Bug: 5533986
Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
2011-10-28 23:57:32 -07:00
Jean-Baptiste Queru
604f52e313
Reconcile with AOSP master
...
Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
2011-10-28 08:37:28 -07:00
Steve Block
31a02dba70
Fix build
...
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
2011-10-28 15:38:20 +01:00
Ken Sumrall
a286480f56
Fix the class_reset command
...
The class_reset command used to reset services that had been set to
"disabled" in the init.rc file to a non-disabled state. Now, if the
service was originally set to "disabled", have the reset command set
it back to disabled. Otherwise, set it to the "reset" state as it
currently does.
Change-Id: I0c10582e46a8e443d4748d9d893ae762b19b653a
2011-10-26 16:58:27 -07:00
sinikang
aa75df74db
[maguro] : add setprop net.tcp.buffersize.hspa
...
-window size optimized for hspa
-Patchset2 : space removed
Change-Id: Ia4d1043d1a93c929721a4d7cca60ce9ff8bbf67a
Signed-off-by: sinikang <sinikang@samsung.com>
2011-10-17 15:56:02 -07:00
Dima Zavin
471157a393
charger: key state being the same is not an error
...
Change-Id: I58d53899dbcca8329b65b189c1a6c5eea413c289
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-13 13:04:38 -07:00
Dima Zavin
47cca06393
Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0
...
* changes:
charger: ignore key event if value didn't change
charger: sync with the current key state on boot
charger: print last_kmsg directly using klog_write
2011-10-13 13:01:56 -07:00
Wu-cheng Li
baad2843a1
Update camera documentation about face detection.
...
bug:5169599
Change-Id: I5280137cee5401fadec36cae732ecb78a2d44dc3
2011-10-13 12:07:05 +08:00
Dima Zavin
2d978c01ee
charger: ignore key event if value didn't change
...
Change-Id: Idcb481550eca53209be217361cac38e48368a04f
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 16:18:23 -07:00
Dima Zavin
2471a6a395
charger: sync with the current key state on boot
...
If the power key was down when we booted, we would not have
gotten the down event and thus the device would not have rebooted until
the user released and pressed it again.
Change-Id: Iecb8c3dba773bce4647748715d056e8e1d77f7e0
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 16:16:07 -07:00
Dima Zavin
d11e1a0278
charger: print last_kmsg directly using klog_write
...
using the macros introduced extra characters that made things align
poorly.
Change-Id: I4924134be159723b4e4ed905c4293a42358d0ff5
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 16:14:00 -07:00
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
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
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
ce020a72e7
Merge "Add checking for log entry format"
2011-10-05 13:01:48 -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
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
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
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
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
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
2a32df25b8
Merge "enable HAVE_DLADDR, since... we have it"
2011-09-28 15:16:44 -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
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