summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | Merge "Fix build error in init when building with bootchart"Conley Owens2011-07-211-0/+2
| | | | |\ \ \
| | | | | * | | Fix build error in init when building with bootchartCarl-Emil Lagerstedt2011-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a build error in init.c if you enabled bootchart, this should probably be shipped upstream if not fixed already. Change-Id: Iea3451c3e15d5cac00c5420d99bfce9a950aaaac
* | | | | | | | Merge "Dump the HID descriptor when available."Jeff Brown2011-07-251-4/+47
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Dump the HID descriptor when available.Jeff Brown2011-07-241-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, always print the input properties when -p is specified. Change-Id: Ibacb6dd26ccab68c85b76928df60fdc2a53c198c
* | | | | | | | Merge "Fix bug 4211099 channel constants and 7.1 mask"Jean-Michel Trivi2011-07-251-3/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug 4211099 channel constants and 7.1 maskJean-Michel Trivi2011-07-241-3/+22
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add definitions for the side and elevated channels. Ccorrect definition of 7.1 mask which uses the side channels rather than the front half-pan channels. Change-Id: I5b6f601f6404d782dc46ef47efac9cc8441fef90
* | | | | | | | Merge "NetlinkEvents: adding support for iptables' quota2 NFLOG messages."JP Abgrall2011-07-251-25/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NetlinkEvents: adding support for iptables' quota2 NFLOG messages.JP Abgrall2011-07-141-25/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It passes the quota2 name and the device at the time the quota was reached. ALERT_NAME=... INTERFACE=... This needs the new kernel in which xt_quota2 can log. Change-Id: Icf5045374e1e33bdd1da0d2a2c183e70903a1fea
* | | | | | | | Merge "Fix returning errno values which should be negative."Mike Lockwood2011-07-221-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix returning errno values which should be negative.Yuncheol Heo2011-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6464b127678ca1d9f4afa7c99fcfce361f4ad4a
* | | | | | | | support for "Add an ANativeWindow API for SurfaceFlinger to suggest an ↵Mathias Agopian2011-07-191-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optimal buffer orientation" Bug: 4487161 Change-Id: I36708fd155415adbb666137692252381c19abcf6
* | | | | | | | am 01acea11: am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB ↵Mike Lockwood2011-07-181-0/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor ID for Lenovo" * commit '01acea112501f7d140f100591319781e59b90d0e': adb: Add USB vendor ID for Lenovo
| * | | | | | | am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '1f72fe991dc2e48c13518015c523f9e3ea048af2': adb: Add USB vendor ID for Lenovo
| | * | | | | | am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '7df080b27921827327952628c46dcea6ae6caf34': adb: Add USB vendor ID for Lenovo
| | | * | | | | am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | * commit '3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a': adb: Add USB vendor ID for Lenovo
| | | | * | | | Merge "adb: Add USB vendor ID for Lenovo"Mike Lockwood2011-07-181-0/+3
| | | | |\ \ \ \
| | | | | * | | | adb: Add USB vendor ID for LenovoMike Lockwood2011-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c2423f567272493067fae04e64fdcb651b0af62 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-07-180-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaef69ddb901f908564167a085c93e91298ce61d4
| * \ \ \ \ \ \ \ \ reset, and keep historyandroid-merger2011-07-080-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am aa4a66a1: am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world ↵Conley Owens2011-07-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readable, system writeable /data/resource-cache." * commit 'aa4a66a16dd9b97fb876bb296366442b8745a10b': Create world readable, system writeable /data/resource-cache.
| * | | | | | | | | | am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system ↵Conley Owens2011-07-151-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writeable /data/resource-cache." * commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67': Create world readable, system writeable /data/resource-cache.
| | * | | | | | | | | am af6e3266: am d0b93f43: Merge "Create world readable, system writeable ↵Conley Owens2011-07-151-0/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /data/resource-cache." * commit 'af6e3266fd8d4808a3aa2b37e08dce67493ff396': Create world readable, system writeable /data/resource-cache.
| | | * | | | | | | | am d0b93f43: Merge "Create world readable, system writeable ↵Conley Owens2011-07-151-0/+5
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /data/resource-cache." * commit 'd0b93f4317c29d434ce22a2643c165317efc5464': Create world readable, system writeable /data/resource-cache.
| | | | * | | | | | | Merge "Create world readable, system writeable /data/resource-cache."Conley Owens2011-07-151-0/+5
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Create world readable, system writeable /data/resource-cache.Mårten Kongstad2011-05-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /data/resource-cache is used to store idmap files. Change-Id: I9b1dbc8d607333b71c05f55a4a402ae92193c36c
* | | | | | | | | | | | am 070ec8e0: resolved conflicts for merge of 3ea075be to honeycomb-plus-aospKenny Root2011-07-151-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '070ec8e02e12aafc8a636737bba3d5ead7cecd8e': Add -F for classify to ls
| * | | | | | | | | | | resolved conflicts for merge of 3ea075be to honeycomb-plus-aospKenny Root2011-07-151-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
| | * | | | | | | | | | am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126': Add -F for classify to ls
| | | * | | | | | | | | am 008cbcd0: Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6': Add -F for classify to ls
| | | | * | | | | | | | Merge "Add -F for classify to ls"Kenny Root2011-07-141-2/+24
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Add -F for classify to lsKenny Root2011-07-131-2/+24
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a field to the non-long version of ls that tells what type of file it is (i.e., regular, directory, link, fifo, etc). This is useful for scripts that don't have direct filesystem access. Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
* | | | | | | | | | | Merge "Show why umount failed."Jeff Brown2011-07-141-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Show why umount failed.Jeff Brown2011-07-141-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2b3fbc46b8dfbe2f05637fb35c298915cd5f524
* | | | | | | | | | | am 51ca95dc: am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to ↵Jean-Baptiste Queru2011-07-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp" into gingerbread-plus-aosp * commit '51ca95dc08a411b7973b5d0626e43f8ba0753370': pixelflinger: back-port AOSP master version. x86: Add vold.fstab to mount the SD card Assembly coded android_memset16 and android_memset32 debuggerd: IA version debuggerd: Reorganize to facilitate IA commit Set the modes for rc.* files in /system/etc DBUS is not fully implemented. Disable it for now debuggerd: Show function names in tombstone backtraces
| * | | | | | | | | | am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to ↵Jean-Baptiste Queru2011-07-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp" into gingerbread-plus-aosp * commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c': pixelflinger: back-port AOSP master version. x86: Add vold.fstab to mount the SD card Assembly coded android_memset16 and android_memset32 debuggerd: IA version debuggerd: Reorganize to facilitate IA commit Set the modes for rc.* files in /system/etc DBUS is not fully implemented. Disable it for now debuggerd: Show function names in tombstone backtraces
| | * | | | | | | | | Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" ↵Jean-Baptiste Queru2011-07-120-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into gingerbread-plus-aosp
| | | * | | | | | | | resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba
| | | | * \ \ \ \ \ \ \ merge intel x86 patches into gingerbread branchDavid 'Digit' Turner2011-07-0842-344/+4013
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | pixelflinger: back-port AOSP master version.David 'Digit' Turner2011-06-1514-119/+975
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pixelflinger doesn't have an x86 JIT, and the generic scanline() routine is _extremely_ slow. This makes UI performance very slow. when running full_x86-eng under emulation. This patch back-ports the AOSP master pixelflinger into the gingerbread branch. This essentially contains more than a dozen new "shortcut" scanline functions used to speed-up the pixel operations that are mostly used with the normal widget UI. GL applications (e.g. Gallery3D) will still be very slow, but this makes the home screen, app launcher, settings and many simple applications work with very usable performance. Change-Id: Ia64d8dd2e46820f07e98c4c9a4ec831b59fc61e4
| | | | | * | | | | | | | x86: Add vold.fstab to mount the SD cardJun Nakajima2011-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95 Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
| | | | | * | | | | | | | Assembly coded android_memset16 and android_memset32Bruce Beare2011-06-158-1/+1334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: Ifa05006df7ce7364d18eb10d64a818d619664475 Author: Lu, Hongjiu <hongjiu.lu@intel.com> Signed-off-by: Mark Gross <mark.gross@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| | | | | * | | | | | | | debuggerd: IA versionBruce Beare2011-06-1511-24/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: I0c0d9c2d7e476b8d117aaf505a9480a47c0b5c05 Signed-off-by: Lei Li <lei.l.li@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| | | | | * | | | | | | | debuggerd: Reorganize to facilitate IA commitBruce Beare2011-06-1511-212/+1207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: I22dd02daf617672fc0a8ba7e396017c57f17e26e Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| | | | | * | | | | | | | Set the modes for rc.* files in /system/etcBruce Beare2011-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
| | | | | * | | | | | | | DBUS is not fully implemented. Disable it for nowBruce Beare2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orig-Change-Id: I2286064bffc7e9fa7381aa04d5d20abf11c3aab7 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
| | | | | * | | | | | | | debuggerd: Show function names in tombstone backtracesMeng Hu2011-06-156-8/+227
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables debuggerd to provide backtraces with function names in tombstone files and log messages. It does this by reading the image file that the address is found in, and parsing the dynamic symbol table to try to extract the symbol corresponding to the given address. This works best when "-Wl,-export-dynamic" is added to the LDFLAGS of each library and executable, because this will cause all symbols to be added to the dynamic symbol table. If this flag is not present, it will still work, but it will only be able to identify functions which are part of the external API of the library/executable. Orig-Change-Id: I618baaff9ed9143b7d1a1f302224e9f21d2b0626
* | | | | | | | | | | | am f75a2ed2: Merge from gingerbread-plus-aospJean-Baptiste Queru2011-07-141-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f75a2ed2138cd8b74597bd57e13d12e1f0b815c2': adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones Add Gigabyte's USB vendor ID to adb. Add Funai's USB vendor ID to adb.
| * | | | | | | | | | Merge from gingerbread-plus-aospJean-Baptiste Queru2011-07-122-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9
| | * | | | | | | | | am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile ↵Mike Lockwood2011-07-122-1/+10
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phones" * commit '4c6b494a109186791bfc421bc10f35eaae871174': adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
| | | * | | | | | | | Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"Mike Lockwood2011-07-122-1/+10
| | | |\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-27 09:20:01 +0000