OSDN Git Service
John Reck [Fri, 15 Jul 2011 20:18:50 +0000 (13:18 -0700)]
Merge "Add a hidden generic property interface"
Jamie Gennis [Fri, 15 Jul 2011 19:35:34 +0000 (12:35 -0700)]
Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"
Nick Pelly [Fri, 15 Jul 2011 18:20:44 +0000 (11:20 -0700)]
am
fc00b2ed: am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
fc00b2ed4fa64621015b47310b91e937581bd3a3':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Justin Ho [Fri, 15 Jul 2011 18:13:22 +0000 (11:13 -0700)]
Merge "Updated some effects and notifications"
Robert Greenwalt [Fri, 15 Jul 2011 18:03:52 +0000 (11:03 -0700)]
Gilles Debunne [Fri, 15 Jul 2011 18:03:42 +0000 (11:03 -0700)]
Merge "Removed vertical padding in PreferenceActivity header list on phones"
Robert Greenwalt [Fri, 15 Jul 2011 18:01:36 +0000 (11:01 -0700)]
Merge "resolved conflicts for merge of
8550f3b8 to master"
Alex Sakhartchouk [Fri, 15 Jul 2011 17:57:33 +0000 (10:57 -0700)]
Merge "For the serialization context, no fifo initialization is necessary."
Gilles Debunne [Fri, 15 Jul 2011 17:55:32 +0000 (10:55 -0700)]
Merge "Bug
4382356: No automatic focus change in ScrollViews"
Robert Greenwalt [Fri, 15 Jul 2011 17:52:54 +0000 (10:52 -0700)]
resolved conflicts for merge of
8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
Nick Pelly [Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)]
am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Robert Greenwalt [Fri, 15 Jul 2011 17:20:48 +0000 (10:20 -0700)]
Fred Quintana [Fri, 15 Jul 2011 17:10:07 +0000 (10:10 -0700)]
Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them."
Robert Greenwalt [Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)]
resolved conflicts for merge of
0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
Fabrice Di Meglio [Fri, 15 Jul 2011 16:49:48 +0000 (09:49 -0700)]
Merge "Implement textDirection heuristic selection."
Gilles Debunne [Fri, 15 Jul 2011 16:41:16 +0000 (09:41 -0700)]
Merge "Bug
5014726: Paste works in ExtractedText"
Glenn Kasten [Fri, 15 Jul 2011 16:23:33 +0000 (09:23 -0700)]
Merge "Bug
5031179 possible fix for assert in join"
Mike Lockwood [Fri, 15 Jul 2011 16:18:34 +0000 (09:18 -0700)]
Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"
Narayan Kamath [Fri, 15 Jul 2011 09:56:31 +0000 (02:56 -0700)]
Merge "Remove the completeAudioAvailable API."
Jeff Brown [Fri, 15 Jul 2011 05:42:15 +0000 (22:42 -0700)]
Merge "Ensure selector state is updated when touch mode changes."
Jeff Brown [Fri, 15 Jul 2011 05:32:09 +0000 (22:32 -0700)]
Merge "Remove edge slop support."
Jeff Brown [Fri, 15 Jul 2011 05:31:40 +0000 (22:31 -0700)]
Merge "Refresh the drawable state when selecting a position."
Jeff Brown [Fri, 15 Jul 2011 05:31:34 +0000 (22:31 -0700)]
Merge "ListView focus bugfix."
Jeff Brown [Fri, 15 Jul 2011 05:31:27 +0000 (22:31 -0700)]
Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."
Jeff Brown [Fri, 15 Jul 2011 05:31:17 +0000 (22:31 -0700)]
Merge "Frameworks: fixes possible invalid pointer index call."
Jeff Brown [Fri, 15 Jul 2011 04:55:58 +0000 (21:55 -0700)]
Merge "Enter touch mode on ACTION_SCROLL."
Adam Powell [Fri, 15 Jul 2011 04:53:41 +0000 (21:53 -0700)]
Merge "Fix bug
5032301 - size list menu icons appropriately."
Jeff Sharkey [Fri, 15 Jul 2011 04:15:49 +0000 (21:15 -0700)]
Merge "Hide NetworkTemplate details, buffered stats I/O."
Mathias Agopian [Fri, 15 Jul 2011 03:21:59 +0000 (20:21 -0700)]
Merge "fix a typo in ISurfaceTexture IPC code"
Mathias Agopian [Fri, 15 Jul 2011 03:20:58 +0000 (20:20 -0700)]
fix a typo in ISurfaceTexture IPC code
Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
Le-Chun Wu [Thu, 14 Jul 2011 21:27:18 +0000 (14:27 -0700)]
Add a call to pthread_attr_destroy to avoid potential memory leaks.
Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
Chia-chi Yeh [Fri, 15 Jul 2011 02:05:33 +0000 (19:05 -0700)]
Merge "VPN: tear down VPN when the dependent interface is down."
Adam Powell [Fri, 15 Jul 2011 01:58:28 +0000 (18:58 -0700)]
Merge "Smooth the spinners"
Adam Powell [Fri, 15 Jul 2011 01:52:26 +0000 (18:52 -0700)]
Merge "Fix regression with legacy expanded menus"
Mathias Agopian [Fri, 15 Jul 2011 01:04:09 +0000 (18:04 -0700)]
Merge "sensorservice: be more robust when there are no sensor h/w"
Jamie Gennis [Fri, 15 Jul 2011 00:54:27 +0000 (17:54 -0700)]
Merge changes Id9aa1003,I8c154189
* changes:
SurfaceTexture: make (dis)connect into an IPC
SurfaceTexture: add support for new connect values
Jamie Gennis [Thu, 14 Jul 2011 02:12:20 +0000 (19:12 -0700)]
SurfaceTexture: make (dis)connect into an IPC
This change makes the ANativeWindow connect and disconnect calls result
in an IPC to the SurfaceTexture object. This will allow us to prevent
multiple simultaneous connections from different processes.
Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
Dianne Hackborn [Fri, 15 Jul 2011 00:23:28 +0000 (17:23 -0700)]
Merge "Move LoadAverageService to the SystemUI apk."
Jamie Gennis [Fri, 15 Jul 2011 00:11:47 +0000 (17:11 -0700)]
SurfaceTexture: fix SurfaceTextureGLToGLTest
This change fixes a couple different issues in the
SurfaceTextureGLToGLTest test fixture:
- incorrect use of conditions
- move logging after the locks are acquired
- call the parent class's TearDown method
- clean up the SurfaceTexture before eglTerminate gets called
Change-Id: I6960e5ab7f144225f01a2089d3f849c99fed0b38
Jeff Brown [Fri, 15 Jul 2011 00:08:16 +0000 (17:08 -0700)]
Merge "Minor code cleanups in vector."
Jeff Brown [Thu, 14 Jul 2011 23:52:10 +0000 (16:52 -0700)]
Merge "Replace Vector _grow/_shrink checks with assert."
James Dong [Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)]
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
Chia-chi Yeh [Thu, 14 Jul 2011 23:22:21 +0000 (16:22 -0700)]
Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors."
Adam Cohen [Thu, 14 Jul 2011 22:55:55 +0000 (15:55 -0700)]
Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter"
Jim Miller [Thu, 14 Jul 2011 22:43:17 +0000 (15:43 -0700)]
Merge "Fix
5027468: prevent screen from turning back on while lockscreen in password mode."
Fabrice Di Meglio [Thu, 14 Jul 2011 22:31:03 +0000 (15:31 -0700)]
Merge "Fix bug #
5025936 TableLayout layout direction resolution is broken"
Chia-chi Yeh [Thu, 14 Jul 2011 22:22:59 +0000 (15:22 -0700)]
Merge "VPN: Hook up the new control protocol and network state."
Jamie Gennis [Wed, 13 Jul 2011 19:57:23 +0000 (12:57 -0700)]
SurfaceTexture: add support for new connect values
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.
Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
Justin Ho [Thu, 14 Jul 2011 21:54:01 +0000 (14:54 -0700)]
Merge "Initial pass at some preload drawables Bug:
5020126"
Chia-chi Yeh [Thu, 14 Jul 2011 21:53:58 +0000 (14:53 -0700)]
Merge "ip-up-vpn: Create proper states for pppd and racoon."
John Wang [Thu, 14 Jul 2011 21:03:11 +0000 (14:03 -0700)]
am
74c425d3: am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
74c425d3e95ed0f47b1a5d447007886d01d7ff56':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 21:00:58 +0000 (14:00 -0700)]
am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
Eino-Ville Talvala [Thu, 14 Jul 2011 20:38:55 +0000 (13:38 -0700)]
Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."
Elliott Hughes [Thu, 14 Jul 2011 20:28:00 +0000 (13:28 -0700)]
Merge "Fix aidl to cope with multiple collection types per method."
Andreas Huber [Thu, 14 Jul 2011 20:22:45 +0000 (13:22 -0700)]
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
Romain Guy [Thu, 14 Jul 2011 19:45:23 +0000 (12:45 -0700)]
Merge "Force bitmaps to load in ARGB8888 by default. Bug #
5024993"
Philip Milne [Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)]
Merge "Rationalize API after adding maximum size feature."
Narayan Kamath [Thu, 14 Jul 2011 18:13:07 +0000 (11:13 -0700)]
Merge "Minor documentation updates for the AudioTrack class."
Glenn Kasten [Thu, 14 Jul 2011 17:59:40 +0000 (10:59 -0700)]
Merge "Add MEDIA_UID"
Wink Saville [Thu, 14 Jul 2011 17:55:58 +0000 (10:55 -0700)]
am
3810361e: am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
Remove STOPSHIP but allow seamless Handoff when possible.
Jaikumar Ganesh [Thu, 14 Jul 2011 17:55:55 +0000 (10:55 -0700)]
am
6dd45316: (-s ours) resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
* commit '
6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Thu, 14 Jul 2011 17:49:38 +0000 (10:49 -0700)]
am
28d92afc: am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
Dianne Hackborn [Thu, 14 Jul 2011 17:48:01 +0000 (10:48 -0700)]
Merge "Improve handling of low memory."
Jaikumar Ganesh [Thu, 14 Jul 2011 17:08:41 +0000 (10:08 -0700)]
Merge "Remove Car audio class from auto pairing."
James Dong [Thu, 14 Jul 2011 16:59:24 +0000 (09:59 -0700)]
Merge "Support profile and level query for SW video decoders"
Jeff Hamilton [Thu, 14 Jul 2011 16:53:08 +0000 (09:53 -0700)]
Merge "unhide public apis"
Andreas Huber [Thu, 14 Jul 2011 16:09:14 +0000 (09:09 -0700)]
Merge "Include all supported mime types when querying decoder profile/level support."
Andreas Huber [Thu, 14 Jul 2011 16:09:07 +0000 (09:09 -0700)]
Merge "Remove legacy http support from stagefright, chromium is the new hotness."
Narayan Kamath [Thu, 14 Jul 2011 15:44:39 +0000 (08:44 -0700)]
Merge "Minor cleanups to TextToSpeech."
Glenn Kasten [Thu, 14 Jul 2011 14:54:34 +0000 (07:54 -0700)]
Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
Jeff Brown [Thu, 14 Jul 2011 11:20:56 +0000 (04:20 -0700)]
Merge "Refactor input dispatcher use of window/app handles."
Jeff Brown [Thu, 14 Jul 2011 11:12:51 +0000 (04:12 -0700)]
Merge "Fix invalid JNI call signature. Bug:
5029536"
Jeff Brown [Thu, 14 Jul 2011 07:29:49 +0000 (00:29 -0700)]
Minor code cleanups in vector.
Fixed a potential bug where calling replaceAt with a reference to
an existing element in the vector at the same index would cause
the element to be destroyed while being copied to itself.
Refactored the conditions in _grow and _shrink for clarity.
The computations are exactly the same but I think it reads better
this way. In particular, the ssize_t variable 's' is gone: it didn't
need to be signed anyways because its value could never be negative.
Change-Id: If087841c15e6a87160eee874720c4a77eb0e99a6
Jeff Brown [Thu, 14 Jul 2011 05:22:02 +0000 (22:22 -0700)]
Replace Vector _grow/_shrink checks with assert.
On review of the code, _grow and _shrink are checking for conditions
that cannot happen and that don't even really make sense. For
example, if _shrink is called with where + amount > mCount then
this is really bad, however the check only considered the case
when where >= mCount and then it would arbitrarily choose a new
value for where. Huh?
As it happens, the callers are correctly validating the
arguments before passing them down to these methods so we can
get rid of this code.
Change-Id: I921852dba8997065bb0e9cac733e82028d14afcd
Nick Pelly [Thu, 14 Jul 2011 05:38:44 +0000 (22:38 -0700)]
am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
01588acaf87cfe9916239b7b26cc6810e0097138':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Jeff Brown [Thu, 14 Jul 2011 05:18:46 +0000 (22:18 -0700)]
Provide more descriptive name for InputChannel ashmem.
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
Adam Powell [Thu, 14 Jul 2011 03:07:41 +0000 (20:07 -0700)]
Merge "Preserve spacing for icons in menus"
Svetoslav Ganov [Thu, 14 Jul 2011 00:23:41 +0000 (17:23 -0700)]
Merge "Touch exploration gesture events change the window id."
Mike Lockwood [Wed, 13 Jul 2011 23:46:50 +0000 (16:46 -0700)]
Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build"
Mike Lockwood [Wed, 13 Jul 2011 15:06:57 +0000 (11:06 -0400)]
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jason Sams [Wed, 13 Jul 2011 23:43:27 +0000 (16:43 -0700)]
Merge "Fix native crash when GL driver fails to initialize."
Dave Santoro [Wed, 13 Jul 2011 23:23:44 +0000 (16:23 -0700)]
Merge "Contacts contract update for display photos."
Kenny Root [Wed, 13 Jul 2011 22:53:12 +0000 (15:53 -0700)]
Merge "Add StorageVolume list to MountService dump"
Kenny Root [Wed, 13 Jul 2011 22:53:03 +0000 (15:53 -0700)]
Merge "Fix debugging for hwui caches"
Daniel Lehmann [Wed, 13 Jul 2011 22:40:03 +0000 (15:40 -0700)]
Merge "Allow a sync adapter to provide an OPEN action for a group"
Christopher Tate [Wed, 13 Jul 2011 22:37:21 +0000 (15:37 -0700)]
Merge "Compress the backup output stream"
Christopher Tate [Mon, 11 Jul 2011 18:31:57 +0000 (11:31 -0700)]
Compress the backup output stream
Zlib compression, with a full flush between each application's
data. Encryption will be performed on the already-compressed data
once that's implemented.
On restore, the streamed data is similarly uncompressed on the fly.
Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
Jeff Sharkey [Wed, 13 Jul 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Control socket tagging through Settings.Secure."
Andreas Huber [Wed, 13 Jul 2011 22:19:44 +0000 (15:19 -0700)]
Merge "Remove old-style software decoders."
David 'Digit' Turner [Wed, 13 Jul 2011 21:55:20 +0000 (14:55 -0700)]
am
0814a9aa: am
db4c5f35: resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
* commit '
0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Scott Main [Wed, 13 Jul 2011 21:55:15 +0000 (14:55 -0700)]
am
9b446cd6: am
bc047bb0: am
e32c49ab: docs: de-new sidenavs
* commit '
9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
docs: de-new sidenavs
Robert Ly [Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)]
am
4e400158: am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
4e4001589911b971d56c72acee140526d4575dac':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Wed, 13 Jul 2011 21:54:24 +0000 (14:54 -0700)]
am
22f4e8f6: am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
Xavier Ducrohet [Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)]
Mike Lockwood [Wed, 13 Jul 2011 21:33:13 +0000 (14:33 -0700)]
Merge "MediaScanner: fix breakage in updates"
Robert Ly [Wed, 13 Jul 2011 21:28:52 +0000 (14:28 -0700)]
Merge "docs: fix for bug
3186839"
Svetoslav Ganov [Wed, 13 Jul 2011 21:19:33 +0000 (14:19 -0700)]
Merge "Polish of the ActivityChooserView and ShareActionProvider."
Wink Saville [Wed, 13 Jul 2011 21:19:12 +0000 (14:19 -0700)]
am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
Wink Saville [Wed, 13 Jul 2011 21:15:19 +0000 (14:15 -0700)]
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE