Commit Graph

36102 Commits

Author SHA1 Message Date
Dianne Hackborn
41083c3fef Merge "Small cleanup of am/pm commands." 2011-06-24 15:22:22 -07:00
Christopher Tate
8408da0556 Merge "Fix settings restore" 2011-06-24 15:15:51 -07:00
Christopher Tate
cd604a1a6e Fix settings restore
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
2011-06-24 15:06:48 -07:00
Romain Guy
52e0ba6cf2 Merge "Reduce the number of UI events required to update a SurfaceTexture." 2011-06-24 14:56:20 -07:00
Jesse Wilson
fb3b1ccf0c Merge "Test that algorithm name is case-insensitive for digest auth." 2011-06-24 14:33:46 -07:00
Romain Guy
6088451c17 Merge "Code cleanup" 2011-06-24 13:21:30 -07:00
Daisuke Miyakawa
47e65eb3d2 Merge "Uppercase region code so that AsYouTypeFormatter works correctly." 2011-06-24 12:32:04 -07:00
Fabrice Di Meglio
4fdc24e60d Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes" 2011-06-24 12:21:28 -07:00
Fabrice Di Meglio
0b142ba28c Merge "Fix potential advances overrun in TextLayoutCache." 2011-06-24 12:02:58 -07:00
John Reck
e5a3cf4a8a Merge "Don't resend WEBKIT_DRAW if paused" 2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
3ba2770d82 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Amith Yamasani
8f60851304 Merge "SearchView improvements per design." 2011-06-24 10:58:38 -07:00
Jaikumar Ganesh
f7864ea94e Merge "Fix excessive locking synchronization leading to deadlocks." 2011-06-24 09:28:02 -07:00
The Android Open Source Project
a9883eaf23 Reconcile with gingerbread-release
Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
2011-06-24 08:08:41 -07:00
Hung-ying Tyan
19b54889c0 Merge "Restart NAT port timeout measurement when keepalive fails and other fixes" 2011-06-24 01:37:53 -07:00
Hung-ying Tyan
e1dd188e34 Merge "Execute all the due wakeup events in SipWakeupTimer." 2011-06-24 01:37:33 -07:00
Mathias Agopian
f81d3dae58 Merge "Add allowSynchronousMode to SurfaceTexture constructor." 2011-06-23 21:31:33 -07:00
Grace Kloba
14a0e58074 Add allowSynchronousMode to SurfaceTexture constructor.
Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
2011-06-23 21:21:47 -07:00
Svetoslav Ganov
917208cec4 Merge "Case insensitive for real" 2011-06-23 19:21:49 -07:00
Fred Quintana
0fe7fec018 Merge "Make the AbstractAccountAuthenticator return an error to the AccountManagerService if it detects a RuntimeException." 2011-06-23 17:33:53 -07:00
Fabrice Di Meglio
495cbd2fc6 Merge "add TextView page to BiDiTests" 2011-06-23 17:14:00 -07:00
David Brown
f415c1e602 Merge "CallerInfo query: Turn on "geo description" lookup for unknown numbers" 2011-06-23 17:12:47 -07:00
Stephen Hines
f903b45eeb Merge "Move divsi3, modsi3, udivsi3, umodsi3 to libbcc." 2011-06-23 17:08:02 -07:00
Stephen Hines
bc820cd16a Merge "Remove verbose logging, update test app and docs." 2011-06-23 17:07:10 -07:00
Adam Powell
13a1da663c Merge "Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off on the bottom" 2011-06-23 17:00:00 -07:00
Gloria Wang
4bf7134865 Merge "- Public part of the Metadata API. - Modify the media framework test for Metadata." 2011-06-23 16:17:55 -07:00
Jesse Wilson
34e1b01761 Merge "Warn about the lack of access controls for SD card HTTP caches." 2011-06-23 16:04:00 -07:00
RoboErik
90ca8b4831 Merge "api comment fixes" 2011-06-23 16:00:00 -07:00
Bart Sears
650a26f22f Merge "Add Droid Ethiopic fonts" 2011-06-23 15:52:17 -07:00
JP Abgrall
a4472c018f Merge "NetworkStatsService: check kernel bandwidth support before enabling" 2011-06-23 15:06:55 -07:00
tedbo
901b41614f Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface." 2011-06-23 14:45:30 -07:00
Scott Main
f43777a930 am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
  docs: add info about manifest attributes that should not change
2011-06-23 14:30:30 -07:00
Raphael Moll
86a1082c82 am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
  Laoutlib_creator: keep original of delegate methods.
2011-06-23 14:30:25 -07:00
Jerry J. Wang
8dd06428c2 am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '4333de2a8e878b319c0e779942b87c042804d352':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
2011-06-23 14:29:55 -07:00
Scott Main
6e0c226e70 am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
  docs: remove exclamation from media title
2011-06-23 14:29:50 -07:00
Katie McCormick
7f45450d9c am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '023622997d886074f7c0cf831945a466803acf5e':
  Doc change: updated TOC for Bluetooth CL.
2011-06-23 14:29:25 -07:00
David Brown
e020f65966 Merge "Update CallerInfo to use the geocoder in the updated location." 2011-06-23 14:08:56 -07:00
Jamie Gennis
b056ca5ede Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode." 2011-06-23 13:02:40 -07:00
Dianne Hackborn
5e382d6608 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Adam Powell
c0d37e339a Merge "Fix bug 4904520 - Swap force close/report buttons" 2011-06-23 12:05:50 -07:00
Philip Milne
c55ad51832 Merge "Handle baseline aligned rows in which some components define baseline and some don't." 2011-06-23 12:05:09 -07:00
Adam Powell
80adaa3b4c Merge "Fix bug 4595971 - Menu not prepared to be prepared" 2011-06-23 11:38:10 -07:00
Brian Carlstrom
6eb0e6526c Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)" 2011-06-23 10:26:38 -07:00
Andreas Huber
a82a35971d Merge "Parse RTP-Info even for live streams." 2011-06-23 10:12:22 -07:00
Andreas Huber
24dd23a2f6 Merge "Reconstruct sync frame indication for content served by the MPEG2TSExtractor" 2011-06-23 10:12:12 -07:00
Gloria Wang
d894b17fa9 Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle." 2011-06-23 09:33:11 -07:00
Glenn Kasten
5b45ade05d Merge "Fix warnings for uninitialized local variables" 2011-06-23 09:00:03 -07:00
Scott Main
04677ff293 am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
* commit 'dba7dd71f296a6220cb5a5308221b9ead1b4f106':
  docs: use new CSE to show results for all sites
2011-06-23 08:17:28 -07:00
Robert Ly
b9b94a8a1a am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
2011-06-23 08:17:23 -07:00
Irfan Sheriff
4cdeee9a8f am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
  Release wakelock after use
2011-06-23 08:17:01 -07:00