summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1The Android Automerger2011-11-023-34/+27
| | | | | This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
* Revert "Merge "charger: make the almost-full frame only show when it's ↵The Android Automerger2011-11-021-10/+1
| | | | | | | current level" into ics-mr0" This reverts commit 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing changes made to d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
* Revert "Merge "Remove log spam" into ics-mr0"The Android Automerger2011-11-021-0/+1
| | | | | This reverts commit d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing changes made to 604f52e31357a774ad49290e323976b1db5b9f38.
* merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
|\
| * Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"The Android Automerger2011-11-023-34/+27
| | | | | | | | | | This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
| * Revert "Merge "charger: make the almost-full frame only show when it's ↵The Android Automerger2011-11-021-10/+1
| | | | | | | | | | | | | | current level" into ics-mr0" This reverts commit 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing changes made to d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.
| * Revert "Merge "Remove log spam" into ics-mr0"The Android Automerger2011-11-021-0/+1
| | | | | | | | | | This reverts commit d4f29767c8cd5a0d8b52b77bed117ca3746af8f3, reversing changes made to 604f52e31357a774ad49290e323976b1db5b9f38.
| * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
|/|
| * Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"The Android Automerger2011-11-023-34/+27
|/ | | | | This reverts commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a, reversing changes made to 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4.
* Merge "libnl_2: Fix memory leaks" into ics-mr0Dmitry Shmidt2011-11-013-27/+34
|\
| * libnl_2: Fix memory leaksDmitry Shmidt2011-11-013-27/+34
| | | | | | | | | | | | | | BUG: b/5532633 Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge "charger: make the almost-full frame only show when it's current ↵Dima Zavin2011-11-011-1/+10
|\ \ | |/ |/| | | level" into ics-mr0
| * charger: make the almost-full frame only show when it's current levelDima Zavin2011-10-311-1/+10
| | | | | | | | | | Change-Id: Id53de101dd3c211d376abfd748e7646e28291749 Signed-off-by: Dima Zavin <dima@android.com>
* | Merge "Remove log spam" into ics-mr0Irfan Sheriff2011-11-011-1/+0
|\ \ | |/ |/|
| * Remove log spamIrfan Sheriff2011-10-291-1/+0
| | | | | | | | | | Bug: 5533986 Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
* | Reconcile with AOSP masterJean-Baptiste Queru2011-10-280-0/+0
|\ \ | | | | | | | | | Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
| * | Fix buildSteve Block2011-10-281-0/+3
| | | | | | | | | | | | Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
* | | Fix the class_reset commandKen Sumrall2011-10-263-1/+7
| |/ |/| | | | | | | | | | | | | | | | | 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
* | [maguro] : add setprop net.tcp.buffersize.hspasinikang2011-10-171-0/+1
| | | | | | | | | | | | | | | | -window size optimized for hspa -Patchset2 : space removed Change-Id: Ia4d1043d1a93c929721a4d7cca60ce9ff8bbf67a Signed-off-by: sinikang <sinikang@samsung.com>
* | charger: key state being the same is not an errorDima Zavin2011-10-131-1/+1
| | | | | | | | | | Change-Id: I58d53899dbcca8329b65b189c1a6c5eea413c289 Signed-off-by: Dima Zavin <dima@android.com>
* | Merge changes Idcb48155,Iecb8c3db,I4924134b into ics-mr0Dima Zavin2011-10-131-14/+30
|\ \ | | | | | | | | | | | | | | | | | | * 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
| * | charger: ignore key event if value didn't changeDima Zavin2011-10-121-0/+4
| | | | | | | | | | | | | | | Change-Id: Idcb481550eca53209be217361cac38e48368a04f Signed-off-by: Dima Zavin <dima@android.com>
| * | charger: sync with the current key state on bootDima Zavin2011-10-121-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | charger: print last_kmsg directly using klog_writeDima Zavin2011-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | using the macros introduced extra characters that made things align poorly. Change-Id: I4924134be159723b4e4ed905c4293a42358d0ff5 Signed-off-by: Dima Zavin <dima@android.com>
* | | Update camera documentation about face detection.Wu-cheng Li2011-10-121-2/+1
|/ / | | | | | | | | bug:5169599 Change-Id: I5280137cee5401fadec36cae732ecb78a2d44dc3
* | Merge "Add log group to rild to improve log collection on modem issue"Wink Saville2011-10-101-1/+1
|\ \
| * | Add log group to rild to improve log collection on modem issueKazuhiro Ondo2011-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add drmrpc group to mediaserver and drmserver so they can make the ↵Jeffrey Tinker2011-10-071-2/+2
|\ \ \ | | | | | | | | | | | | drm rpc calls"
| * | | Add drmrpc group to mediaserver and drmserver so they can make the drm rpc callsJeffrey Tinker2011-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS Change-Id: Iacfe3e79f067172085b96bb4cd4484101aa5be1e
* | | | Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."Wu-cheng Li2011-10-071-2/+2
|\ \ \ \
| * | | | Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.Wu-cheng Li2011-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5422679 Change-Id: Ia4a09328bd9e1d36af680be4d065bc08cf0dec0f
* | | | | Merge "Add checking for log entry format"Kenny Root2011-10-052-7/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add checking for log entry formatKenny Root2011-10-032-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log tag may be zero length if corrupted, so check for this condition. Change-Id: I7616226dabe78a85859b0ab53aca08f734dbdd84
* | | | | Merge "Add command line help for the new 'adb backup -all -nosystem'"Christopher Tate2011-10-041-5/+9
|\ \ \ \ \
| * | | | | Add command line help for the new 'adb backup -all -nosystem'Christopher Tate2011-10-031-5/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Create drmrpc group for security services"Jeffrey Tinker2011-10-041-0/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Create drmrpc group for security servicesJeffrey Tinker2011-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug 4598045 Change-Id: I5550203927146fd6864408b3ac2f5e6f5d2b1d77
| * | | merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| |\ \ \
| | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | |\ \ \
| | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-310-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |/| | | | | | | | | | | |/|/ / /
| | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-08-290-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-230-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-220-0/+0
| | | | | | | | | | | |\ \ \