Commit Graph

17112 Commits

Author SHA1 Message Date
Kenny Root
542c8ead1d Merge "Import revised translations" into gingerbread 2010-10-14 14:17:57 -07:00
Raphael Moll
6f3c5bd194 Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread 2010-10-14 13:01:17 -07:00
Mathias Agopian
295c7002f6 Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread 2010-10-14 12:38:51 -07:00
Jaikumar Ganesh
8e1e9df48f Merge "Check for state before disconnecting." into gingerbread 2010-10-14 12:36:00 -07:00
Mathias Agopian
015fb3fb41 may fix 3097381 and 3097482. don't abort on/off if the animation fails
now that sf handles more of the screen on/off state, we don't want to abort
because/if the animation fails for some reason (which will be the case on the
emulator).

Change-Id: I239e0a39cf8aff3074647e82db92de4a0bf0e494
2010-10-14 12:24:54 -07:00
Joe Malin
43233b1a43 Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 2010-10-14 12:05:33 -07:00
Jeff Brown
c04563d340 Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 2010-10-14 11:52:58 -07:00
Roy West
7b379f690b Merge "Change storage names to match 10-13 decision" into gingerbread 2010-10-14 11:15:50 -07:00
Joe Onorato
1013d9e5df Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 2010-10-14 10:59:37 -07:00
Gilles Debunne
8aa3f28b6f Merge "Really leave text selection mode when using the trackball." into gingerbread 2010-10-14 10:58:59 -07:00
Jeff Brown
7e40f36237 Make sure EventHub reports added/removed devices immediately.
Fixed a bug where EventHub would not report changes in devices
until the next event.

Bug: 3096147
Change-Id: Ie4c3e1d14d0ad806cfaa212611ce06034d1b94d4
2010-10-14 02:23:43 -07:00
Raphael Moll
2cf43c6988 MinGW/Cygwin requires open() in O_BINARY mode.
Alsso printf %zd is not supported on MinGW/Cygwin.

Change-Id: I03811dabb46e2b05dd1d8abcc0ff97b125c77d54
2010-10-13 21:55:15 -07:00
Hung-ying Tyan
9f2c66df5d Merge "Make SipService listen to WIFI state change events." into gingerbread 2010-10-13 18:36:31 -07:00
Kenny Root
7f7c9a24b6 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Kenny Root
95a6889312 OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
David Brown
5ebbba59e7 Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 2010-10-13 17:48:05 -07:00
Justin Ho
a81d5212c2 Merge "Updated media transport controls" into gingerbread 2010-10-13 17:42:03 -07:00
Justin Ho
6ea889064d Merge "Updating popup center asset (v5)" into gingerbread 2010-10-13 17:15:00 -07:00
Jesse Wilson
04e736394a Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 2010-10-13 16:59:12 -07:00
Jaikumar Ganesh
0f67f57fa9 Merge "Remove STOPSHIP and reduce log spam." into gingerbread 2010-10-13 16:52:52 -07:00
Vasu Nori
3de1115fc9 Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 2010-10-13 16:50:45 -07:00
Jaikumar Ganesh
93aa52d2b4 Merge "Work around for errant headsets." into gingerbread 2010-10-13 16:44:17 -07:00
Mindy Pereira
1837c61e40 Merge "Never show overscroll if the page scrolls at all." into gingerbread 2010-10-13 16:31:18 -07:00
Mindy Pereira
742983fdec Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 2010-10-13 16:23:15 -07:00
Mathias Agopian
c2a2b5c440 Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 2010-10-13 15:55:57 -07:00
Andreas Huber
bd44d85426 Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 2010-10-13 15:46:18 -07:00
Dan Morrill
03a7820c96 Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 2010-10-13 15:20:34 -07:00
Kenny Root
8e896920e7 Merge "Handle native library deletion in scanPackage" into gingerbread 2010-10-13 14:50:29 -07:00
Kenny Root
322ea9435a Merge "OBB: Change documentation to reflect reality" into gingerbread 2010-10-13 14:49:42 -07:00
Mathias Agopian
9daa5c9b9d implement part of [3094280] New animation for screen on and screen off
add support for screen on animation

Change-Id: If50cf52ae04b95b42da7d74cf7fa96d5cb54d238
2010-10-13 14:28:26 -07:00
Andreas Huber
f61daab2ed Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 2010-10-13 14:25:32 -07:00
Andreas Huber
7a838543a9 Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread 2010-10-13 13:45:57 -07:00
Kenny Root
ad34e3b167 Merge "Add shutdown assurance" into gingerbread 2010-10-13 13:19:25 -07:00
Wink Saville
3ac8dfcb03 Merge "Fix NPE caused by Change I4df27119." into gingerbread 2010-10-13 12:17:05 -07:00
Scott Main
e4c9d8e8ed am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread

* commit '5249ad03454301744374d04e04b38aaad3b01530':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:08:02 -07:00
Nick Pelly
6e6864a54b Merge "Add missing native methods to fix boot." into gingerbread 2010-10-13 10:16:49 -07:00
Andreas Huber
debb3a6be9 Merge "Support for writing to MPEG2 transport stream files." into gingerbread 2010-10-13 09:14:40 -07:00
Andreas Huber
5558435e53 Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 2010-10-13 09:14:13 -07:00
Mike Lockwood
91a2e55166 Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 2010-10-13 05:46:15 -07:00
Justin Ho
137ef22cef Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Hung-ying Tyan
7daf32433a Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Nick Pelly
9bf9f7a444 Merge "Fix build." into gingerbread 2010-10-12 19:23:13 -07:00
Dianne Hackborn
f0908a156c Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
1f5843c4d2 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Justin Ho
c2dc99c3ca Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Hung-ying Tyan
3874b18c1d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -07:00
Adam Powell
308ddf283c Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
6cd9eff46d Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jeff Brown
5cbba469d9 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Adam Powell
4254081daf Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 2010-10-12 15:00:30 -07:00