OSDN Git Service
Chih-Wei Huang [Tue, 1 Jan 2013 07:24:33 +0000 (15:24 +0800)]
Correct LOCAL_LDLIBS of adb
adb doesn't really use ncurses-libs, remove it.
Add -ldl for the symbols dlclose, dlerror, dlopen...
introduced from dso_dlfcn.c of libcrypto_static.a.
Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
Vishal Bhoj [Mon, 14 May 2012 16:04:12 +0000 (16:04 +0000)]
toolbox: rmmod: fix module unloading
Replace "-" with "_" in module name. This would keep
rmmod compatible with module-init-tools version of rmmod
Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Tanguy Pruvot [Fri, 4 May 2012 09:17:11 +0000 (11:17 +0200)]
toolbox: implement rm -f flag
this prevent compatibility errors in scripts (file "-f" not found)
The force flag will not return an error if the file doesnt exist.
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68
Jack Ren [Fri, 12 Aug 2011 10:39:04 +0000 (18:39 +0800)]
adb: usb_windows: fix adb connection lost issue
Windows adb connection could be lost if the target
side kernel enables the kmemleak.
The root cause is that kmemleak downgrades USB
performance, and lead to Windows adb host application
timeout because usb_write()/usb_read()'s timeout time is
very short. That issue is not reproducible in Linux
host because its usb_write() timeout is 5s and usb_read()
is blocked until return:
usb_write() usb_read()
Linux 5000ms blocked until return
Windows 500+len*8 ms 500+len*8 ms
To fix that issue, extend the Windows adb host usb_write
timeout time to 5 seconds and usb_read() as a blocked routine:
usb_write() usb_read()
Windows 5000ms blocked until return
Change-Id: If54e2b4c396a5a06318c0ee0b3326a00e7661fbc
Signed-off-by: Yu Wang <yu.y.wang@intel.com>
Signed-off-by: Jin Can Zhuang <jin.can.zhuang@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Wu, Hao [Tue, 17 Jan 2012 20:04:11 +0000 (12:04 -0800)]
adb,fastboot: add USB support for Intel Vendor ID
This patch adds Intel USB Vendor ID into the support
list for adb and fastboot.
Signed-off-by: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Dianne Hackborn [Thu, 9 Feb 2012 19:19:00 +0000 (11:19 -0800)]
New user definitions for isolated sandboxes.
Change-Id: I302f89c102bc35dcd70168748e205b41fdbf6576
Chih-Wei Huang [Sun, 29 Apr 2012 07:04:55 +0000 (15:04 +0800)]
Set correct permission for pppd
The pppd needs setuid root to setup ppp interface.
Chih-Wei Huang [Wed, 4 Apr 2012 16:25:59 +0000 (00:25 +0800)]
Merge commit 'android-4.0.4_r1.1' into ics-x86
Conflicts:
init/init.c
The Android Automerger [Sat, 10 Mar 2012 17:07:32 +0000 (09:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:24:04 +0000 (19:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Mar 2012 04:46:16 +0000 (20:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chia-chi Yeh [Wed, 7 Mar 2012 22:52:10 +0000 (14:52 -0800)]
init.rc: update the permission of /data/local.
Bug:
6131945
Change-Id: I3094a471dcfb02b786f47b6778c8fed3726325ec
Chih-Wei Huang [Thu, 23 Feb 2012 09:38:47 +0000 (17:38 +0800)]
init: remove the workaround to disable hardware gralloc
The workaround changes ro.hardware property that causes
side effect. Move the workaround to libhardware.
The Android Automerger [Tue, 24 Jan 2012 21:33:52 +0000 (13:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Xavier Ducrohet [Sat, 14 Jan 2012 00:03:37 +0000 (16:03 -0800)]
Add USB vendor IDs for Quanta, INQ and Sony.
Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
The Android Automerger [Fri, 20 Jan 2012 00:29:45 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andrew Hsieh [Fri, 13 Jan 2012 03:00:03 +0000 (19:00 -0800)]
Add Intel's vendor ID to adb
Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
The Android Automerger [Sat, 14 Jan 2012 00:19:04 +0000 (16:19 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Benoit Goby [Fri, 13 Jan 2012 19:46:51 +0000 (11:46 -0800)]
Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1
The Android Automerger [Thu, 12 Jan 2012 22:02:11 +0000 (14:02 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Benoit Goby [Thu, 12 Jan 2012 20:57:30 +0000 (12:57 -0800)]
HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE
Export androidboot.modelno command line parameter as ro.boot.modelno
property, so that we can set the USB iProduct string to the correct
value on Stingray.
Bug:
5853250
Change-Id: Idc413f15dc4d9d02027589d1b11bdf50e0a79ccc
The Android Automerger [Thu, 12 Jan 2012 00:30:02 +0000 (16:30 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
James Dong [Thu, 12 Jan 2012 00:16:07 +0000 (16:16 -0800)]
Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
Xavier Ducrohet [Wed, 11 Jan 2012 19:55:45 +0000 (11:55 -0800)]
Add USB Vendor ID for Fujitsu and Lumigon.
Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d
Vladimir Chtchetkine [Tue, 13 Dec 2011 20:19:29 +0000 (12:19 -0800)]
Cherry-picked from
c4f37eed7 in Do not merge.
Fix the build.
Conditionally compile code that is intended to run inside the emulator only.
Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
Vladimir Chtchetkine [Fri, 9 Dec 2011 23:49:47 +0000 (15:49 -0800)]
Cherry-picked from
c13daef7b on Do not merge.
Use QEMU pipe for ADB communication when running in emulator.
Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
James Dong [Fri, 6 Jan 2012 23:19:26 +0000 (15:19 -0800)]
Close a security hole - do not give world readable/writable access to /data/drm
o related-to-bug:
5834297
Change-Id: I8e459610b4f69999be37364c2359b2bac82d4a2a
Chih-Wei Huang [Sun, 1 Jan 2012 19:16:41 +0000 (03:16 +0800)]
init: avoid virtual console be set blanked
Chih-Wei Huang [Thu, 14 Apr 2011 01:48:52 +0000 (09:48 +0800)]
init: builtins: Add 'setkeycode' command to init.rc parser
The command is used to set an entry into the kernel's scancode-to-keycode map.
Change-Id: If772b3590c08d3696ff9d015f1faf0e75405e262
Chih-Wei Huang [Tue, 12 Apr 2011 08:46:45 +0000 (16:46 +0800)]
init: make sure the last parameter to execve is NULL
Extend the buffer to hold one more pointer, and set it is NULL.
Change-Id: I3018d62a1b0d61c0a3f5f2f7ffa12c7ce9ee32c5
Chih-Wei Huang [Tue, 1 Feb 2011 07:47:03 +0000 (15:47 +0800)]
init: change FIRMWARE_DIR1 for Android-x86
Change-Id: I0f54d1dcfcd7b1fe4b5f1dbe4ee3aa7289a5ecea
Chih-Wei Huang [Thu, 27 Jan 2011 09:23:27 +0000 (17:23 +0800)]
init: disable hardware specific gralloc
To disable 3D hardware acceleration totally, we need to
tell HAL not to load hardware specific gralloc library.
This is just a workaround. In the future we should implement a
gralloc wrapper to detect graphic driver and load the appropriate
gralloc library.
Change-Id: Idbba5794bd850fce0b6f58a3f45dddee60086a25
Chih-Wei Huang [Thu, 27 Jan 2011 09:19:57 +0000 (17:19 +0800)]
init: set debug.logcat according to DEBUG variable
Change-Id: If869965474a9ae68957cb9ee4e67866ad43e9bb6
Chih-Wei Huang [Thu, 27 Jan 2011 08:42:14 +0000 (16:42 +0800)]
ueventd.rc: set proper permisions for android-x86 devices
Change-Id: If0c172bbabf6270510b4062f6f4da7a1ffa62073
Chih-Wei Huang [Thu, 27 Jan 2011 08:38:18 +0000 (16:38 +0800)]
init: create a subdirectory for drm subsystem
Change-Id: Id35d4363fe0bbc94a2e9fcbae633ee4430b86929
Chih-Wei Huang [Sat, 15 Jan 2011 22:44:37 +0000 (06:44 +0800)]
ueventd.rc: remove redundant definitions
Change-Id: Icb4f051abf941052aca9752ca2949386738d94e5
Chih-Wei Huang [Sat, 15 Jan 2011 22:25:37 +0000 (06:25 +0800)]
init.rc: use relative path for symlink
Usually it's better to use relative path for symlink. For example,
to use Android in a chroot environment, the absolute symlink will
fail outside the chroot environment. Using relative path guarantees
the link will work both inside and outside chroot.
Change-Id: I2f654a05189b9a666aed1fc7bdfb5a50357aff78
Magnus Malmborn [Fri, 14 Jan 2011 08:42:18 +0000 (09:42 +0100)]
Adding an 'exec' implementation to init
This is useful for running programs synchronously
during startup.
Change-Id: I0212fad22613124dd13b4f20b86d0dcc6cb59b6e
Weichuan Yan [Tue, 28 Dec 2010 07:45:02 +0000 (15:45 +0800)]
Fix a crash when there is no command action in some trigger
Change-Id: I5c002c9f86afceca83c39715576392cf88dd8614
Signed-off-by: Weichuan Yan <wchyan@marvell.com>
Chih-Wei Huang [Mon, 14 Dec 2009 03:26:07 +0000 (11:26 +0800)]
do not include goldfish files on x86
Yi Sun [Sat, 12 Sep 2009 00:43:51 +0000 (17:43 -0700)]
fixed a bug caused by the changes in the prop name size
Jim Huang [Wed, 9 Sep 2009 03:47:40 +0000 (11:47 +0800)]
Let console applications have a controlling tty.
Since the logic in open_console() is changed, terminating console
application within a shell is now possible via Ctrl-C.
The Android Automerger [Wed, 14 Dec 2011 00:04:11 +0000 (16:04 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 13 Dec 2011 06:09:38 +0000 (22:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jesse Hall [Mon, 12 Dec 2011 18:32:55 +0000 (10:32 -0800)]
Document ANativeWindow's buffer refcounting
Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790
Christopher Tate [Fri, 9 Dec 2011 03:04:34 +0000 (19:04 -0800)]
Fix 'adb backup' on Windows
Use the same call sequence that 'adb pull' uses for creating the
output file. adb_open_mode() apparently does not work on Windows
hosts.
Bug
5733007
Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
The Android Automerger [Tue, 6 Dec 2011 04:36:43 +0000 (20:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Vladimir Chtchetkine [Wed, 30 Nov 2011 18:20:27 +0000 (10:20 -0800)]
Fixes ADB crash on Windows due to large number of connections. do not merge.
The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to
wait on connection events. When number of connections exceeds 64, ADB crashes,
because WaitForMultipleObjects API doesn't support more than 64 handles. This
CL contains a fixer routine that allows waiting on an arbitrary number of
handles.
(cherry picked from commit
ac52833e48f46dfd9f7c8f86236ee8b437850c0a)
Change-Id: I8ad264765e5b38d01a31e42b445f97ea86e49948
The Android Automerger [Mon, 28 Nov 2011 20:23:45 +0000 (12:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:57:10 +0000 (11:57 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Nick Pelly [Tue, 22 Nov 2011 00:03:43 +0000 (16:03 -0800)]
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
Nick Pelly [Mon, 21 Nov 2011 22:55:59 +0000 (14:55 -0800)]
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.
The package name is also reverted from com.android.nfc3 to com.android.nfc
The NFC uid needs to get bumped (25 to 27) to allow the cert change.
Bug:
5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893
Andy McFadden [Thu, 17 Nov 2011 17:48:03 +0000 (09:48 -0800)]
Merge "DO NOT MERGE - disable memory dumps" into ics-mr1
Andy McFadden [Wed, 16 Nov 2011 23:50:55 +0000 (15:50 -0800)]
DO NOT MERGE - disable memory dumps
This disables the hex dumps of memory for registers other than PC
and LR.
Bug
5484924
Change-Id: I26cff857e5d01ed30548ca3e55bdddd63b592c0c
The Android Open Source Project [Wed, 16 Nov 2011 17:33:01 +0000 (09:33 -0800)]
am
c6023243: Reconcile with ics-factoryrom-2-release
* commit '
c60232434c941b5175a9ebb542b1c872866d3409':
The Android Open Source Project [Wed, 16 Nov 2011 16:56:49 +0000 (08:56 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: I9671d18aeee882196d56644533c962942c4fbb70
The Android Automerger [Thu, 10 Nov 2011 14:47:41 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
JP Abgrall [Wed, 9 Nov 2011 18:30:08 +0000 (10:30 -0800)]
adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
Normally only bandwidth stats for the uid reading .../stats is returned.
With the extra group, adb shell will be able to read stats from
all UIDs.
This is to be used to offer data usage profiling to developers.
Change-Id: If3d2941ce5aa4dbb1a23947b97b893149ba224f7
The Android Automerger [Wed, 9 Nov 2011 14:48:04 +0000 (06:48 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:02:01 +0000 (10:02 -0800)]
Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:46:45 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
tk.mun [Thu, 13 Oct 2011 13:58:55 +0000 (22:58 +0900)]
Wimax: wimax related changes for libnetutils
- Modified dhcp renew code for the new conenctivity changes in ICS
Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:
5486930
Dima Zavin [Mon, 7 Nov 2011 17:32:02 +0000 (17:32 +0000)]
am
4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '
4a2539085062a715b0d345eb50ea48738423c909':
rootdir: init.rc: write default oom_adj before starting ueventd
Dima Zavin [Fri, 4 Nov 2011 19:45:52 +0000 (12:45 -0700)]
rootdir: init.rc: write default oom_adj before starting ueventd
Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events
Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
The Android Open Source Project [Fri, 4 Nov 2011 14:57:25 +0000 (07:57 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96
The Android Automerger [Thu, 3 Nov 2011 04:04:38 +0000 (21:04 -0700)]
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit
4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
The Android Automerger [Thu, 3 Nov 2011 04:04:22 +0000 (21:04 -0700)]
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing
changes made to
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
The Android Automerger [Thu, 3 Nov 2011 04:04:09 +0000 (21:04 -0700)]
Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing
changes made to
604f52e31357a774ad49290e323976b1db5b9f38.
The Android Automerger [Thu, 3 Nov 2011 03:53:30 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Open Source Project [Wed, 2 Nov 2011 17:53:31 +0000 (10:53 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624
The Android Automerger [Wed, 2 Nov 2011 17:18:15 +0000 (10:18 -0700)]
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit
4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
The Android Automerger [Wed, 2 Nov 2011 17:18:01 +0000 (10:18 -0700)]
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing
changes made to
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
The Android Automerger [Wed, 2 Nov 2011 17:17:46 +0000 (10:17 -0700)]
Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing
changes made to
604f52e31357a774ad49290e323976b1db5b9f38.
The Android Automerger [Wed, 2 Nov 2011 16:48:57 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:47:10 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 2 Nov 2011 11:41:24 +0000 (04:41 -0700)]
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit
4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing
changes made to
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
Dmitry Shmidt [Wed, 2 Nov 2011 00:13:04 +0000 (00:13 +0000)]
am
4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0
* commit '
4f7c0843bbaa9cb4ec3a7890461cebbee689530a':
libnl_2: Fix memory leaks
Dmitry Shmidt [Wed, 2 Nov 2011 00:12:02 +0000 (17:12 -0700)]
Merge "libnl_2: Fix memory leaks" into ics-mr0
Dmitry Shmidt [Tue, 1 Nov 2011 22:24:02 +0000 (15:24 -0700)]
libnl_2: Fix memory leaks
BUG: b/
5532633
Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dima Zavin [Tue, 1 Nov 2011 22:30:25 +0000 (22:30 +0000)]
am
6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0
* commit '
6fb3df8d468a105b49c1cdbbdcb061dc8de022a4':
charger: make the almost-full frame only show when it's current level
Dima Zavin [Tue, 1 Nov 2011 22:28:42 +0000 (15:28 -0700)]
Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0
Irfan Sheriff [Tue, 1 Nov 2011 20:19:46 +0000 (20:19 +0000)]
am
d4f29767: Merge "Remove log spam" into ics-mr0
* commit '
d4f29767c8cd5a0d8b52b77bed117ca3746af8f3':
Remove log spam
Irfan Sheriff [Tue, 1 Nov 2011 20:17:53 +0000 (13:17 -0700)]
Merge "Remove log spam" into ics-mr0
The Android Automerger [Tue, 1 Nov 2011 13:46:40 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Dima Zavin [Mon, 31 Oct 2011 23:53:41 +0000 (16:53 -0700)]
charger: make the almost-full frame only show when it's current level
Change-Id: Id53de101dd3c211d376abfd748e7646e28291749
Signed-off-by: Dima Zavin <dima@android.com>
Mathias Agopian [Mon, 31 Oct 2011 21:27:36 +0000 (14:27 -0700)]
restart surfaceflinger and drmserver when servicemanager dies
Bug:
5450389
Change-Id: Ib4e73836721e25e2a88185167b030ea75e0d74e3
The Android Automerger [Sun, 30 Oct 2011 13:48:38 +0000 (06:48 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Irfan Sheriff [Sat, 29 Oct 2011 06:57:32 +0000 (23:57 -0700)]
Remove log spam
Bug:
5533986
Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
Jeff Sharkey [Fri, 28 Oct 2011 18:56:17 +0000 (11:56 -0700)]
Merge "Gracefully handle truncated log messages." into ics-mr1
Jean-Baptiste Queru [Fri, 28 Oct 2011 15:39:50 +0000 (15:39 +0000)]
am
604f52e3: Reconcile with AOSP master
* commit '
604f52e31357a774ad49290e323976b1db5b9f38':
Fix build
Jean-Baptiste Queru [Fri, 28 Oct 2011 15:37:25 +0000 (08:37 -0700)]
Reconcile with AOSP master
Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
Steve Block [Fri, 28 Oct 2011 14:36:41 +0000 (15:36 +0100)]
Fix build
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
The Android Automerger [Thu, 27 Oct 2011 13:48:16 +0000 (06:48 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Ken Sumrall [Thu, 27 Oct 2011 02:49:44 +0000 (02:49 +0000)]
am
a286480f: Fix the class_reset command
* commit '
a286480f56012abdb4ef4ddab1c19a5c2316b7b8':
Fix the class_reset command
Jeff Sharkey [Thu, 27 Oct 2011 01:40:39 +0000 (18:40 -0700)]
Gracefully handle truncated log messages.
Bug:
5522726
Change-Id: I8637c7da854ec1ecb321632c45ee9bc2edc94a67
Ken Sumrall [Wed, 26 Oct 2011 23:56:00 +0000 (16:56 -0700)]
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
The Android Automerger [Thu, 20 Oct 2011 14:02:27 +0000 (07:02 -0700)]
merge in ics-release history after reset to master
Andy McFadden [Wed, 19 Oct 2011 20:28:33 +0000 (13:28 -0700)]
Enable verbose register memory dumps
Dump some memory at addresses for all registers that look like they
might have valid addresses. Previously this was only done for PC
and LR.
(This is expected to be disabled before ship.)
Bug
5484924
Change-Id: I9802eaa396783e1286ae0c53eaf2473892c38a02
Andy McFadden [Wed, 19 Oct 2011 19:01:26 +0000 (12:01 -0700)]
Merge "Add log summary to tombstones"
Nick Kralevich [Wed, 19 Oct 2011 16:13:04 +0000 (09:13 -0700)]
Merge "liblog: do better checks of log messages."