Commit Graph

36123 Commits

Author SHA1 Message Date
Chia-chi Yeh
6904f14b89 KeyStore: fix test-keystore
Change-Id: I1dcbd5c3cc7569c397d2480cda76288a9e28cd5c
2011-06-27 10:38:10 -07:00
Chia-chi Yeh
91a465b73a KeyStore: allow system user to get secrets from keystore.
Change-Id: I9cb41344c17fb33e6614a45d46368a9c43e3dce7
2011-06-26 18:24:19 -07:00
Brian Carlstrom
e709d94a29 Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)" 2011-06-26 15:30:37 -07:00
Jamie Gennis
15dfa4a90f Merge "SurfaceTexture: detach from Dalvik when necessary." 2011-06-26 12:23:12 -07:00
Irfan Sheriff
1a10a03038 Merge "WifiWatchdogService - disable bad connections" 2011-06-25 11:20:54 -07:00
Jeff Sharkey
242d852bb6 Merge "Finish any enter animation when jumping to state." 2011-06-24 23:12:38 -07:00
Adam Powell
72afe83ef5 Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views" 2011-06-24 19:17:38 -07:00
Fabrice Di Meglio
a13d79cef1 Merge "Introduce MarginLayoutParams marginStart and margingEnd" 2011-06-24 19:00:30 -07:00
Romain Guy
7ef040faf4 Merge "Update GLTextureView sample to do something real." 2011-06-24 18:52:47 -07:00
Jim Miller
c2a9092813 Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView." 2011-06-24 18:44:08 -07:00
Romain Guy
f6e83638b4 Merge "Don't set texture parameters on every frame." 2011-06-24 17:54:25 -07:00
Romain Guy
a216de2725 Merge "Properly tear down TextureView" 2011-06-24 17:21:26 -07:00
Scott Main
75c056a243 am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
  docs: add Lenevo driver info
2011-06-24 17:15:53 -07:00
Tsu Chiang Chuang
660e5892db Merge "adding notification stress tests." 2011-06-24 16:55:36 -07:00
Robert Greenwalt
f78938a7db Merge "resolved conflicts for merge of 40717996 to master" 2011-06-24 16:39:08 -07:00
Robert Greenwalt
0cd3472530 resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
2011-06-24 16:10:06 -07:00
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