Commit Graph

3062 Commits

Author SHA1 Message Date
Dima Zavin 4238242982 am 6606dc95: am 471157a3: charger: key state being the same is not an error
* commit '6606dc9532b20f55d18e0d9cc925358aa1ceb119':
  charger: key state being the same is not an error
2011-10-13 14:09:07 -07:00
Dima Zavin 489ddab36e am d6da4d4f: am 47cca063: Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0
* commit 'd6da4d4fa58b40f66a4bb5b7b0d15bfe7ab7d8c9':
  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 14:08:49 -07:00
Dima Zavin 6606dc9532 am 471157a3: charger: key state being the same is not an error
* commit '471157a393d052aece013d1f8b7701aaadca3b6c':
  charger: key state being the same is not an error
2011-10-13 13:30:00 -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 d6da4d4fa5 am 47cca063: Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0
* commit '47cca063939a9d5a3ea0b287d64aac0f53f4c45c':
  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:03:08 -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
Andy McFadden 136dcc5ce6 Show maps near native fault address
This adds some additional output to native crashes.  For example, if
something tried to access a bit of mmap(/dev/zero) memory that had
been mprotect()ed, you might see output like this:

I DEBUG   : memory map around addr 4015a00c:
I DEBUG   : 40159000-4015a000 /system/lib/libstdc++.so
I DEBUG   : 4015a000-40162000 /dev/zero
I DEBUG   : b0001000-b0009000 /system/bin/linker

The idea is to see what's in and around the fault address to make it
easier to identify bus errors due to file truncation and segmentation
faults caused by buffer over/underruns.

No output is generated for accesses below 0x1000 (which are likely
NULL pointer dereferences) or for signals that don't set si_addr.

Also, suppress the fault address for signals that don't set si_addr:
I DEBUG   : signal 6 (SIGABRT), code 0 (?), fault addr --------

We still print "fault addr" followed by 8 characters for anything
that is parsing the contents.  The "address" shown for signals like
SIGABRT was meaningless and possibly confusing.

Bug 5358516

Change-Id: Icae8ef309ea2d89b129f68d30f96b2ca8a69cc6c
2011-10-13 12:35:55 -07:00
Wu-cheng Li 077b42cd4b am 5babfad4: am baad2843: Update camera documentation about face detection.
* commit '5babfad44584641316b4a2ff62c1a7c9392740e6':
  Update camera documentation about face detection.
2011-10-12 21:15:22 -07:00
Wu-cheng Li 5babfad445 am baad2843: Update camera documentation about face detection.
* commit 'baad2843a1af443aa251be510c4476159d064d20':
  Update camera documentation about face detection.
2011-10-12 21:14:15 -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
Romain Guy b6472bd1a9 am 6bcd4d3e: Add ANDROID_API macro to export symbols
* commit '6bcd4d3e7310240d9424f13444542572e9ae3632':
  Add ANDROID_API macro to export symbols
2011-10-12 20:42:53 -07: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
Romain Guy 6bcd4d3e73 Add ANDROID_API macro to export symbols
Change-Id: I55294713c8dd1ac32d6013d084f1bb502fc3572f
2011-10-12 13:45:59 -07:00
Nick Kralevich f620912651 am d707fb3f: enable heap randomization.
* commit 'd707fb3fb6448be04d6e14f7e478df7e298ebf35':
  enable heap randomization.
2011-10-12 12:38:24 -07:00
Nick Kralevich d707fb3fb6 enable heap randomization.
Bug: 5250555

Change-Id: I7acb0645402611875c481aec33ece85fced7a336
2011-10-11 15:35:39 -07:00
David 'Digit' Turner 6306d41925 DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
+ Handle EINTR in read()
Bug: 5438357
Backport from master.

Change-Id: If7d486dd4fb5666ce16ef36dca5f417da23e0b73
2011-10-10 14:26:13 -07:00
Wink Saville 6fcfb8e260 am 4e803c3c: Merge "Add log group to rild to improve log collection on modem issue"
* commit '4e803c3c18ad6a0cebbb16e2cf623a174f5201e1':
  Add log group to rild to improve log collection on modem issue
2011-10-10 12:26: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 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