James Dong
31557206d9
am 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
...
* commit '6f2b5d614c13fb93f20697bce3bf73176828276d':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
2011-04-11 14:28:24 -07:00
Eric Fischer
64eecc0755
Import revised translations.
...
Change-Id: Ib8940867bc7a807284dbb1297b5856e352690850
2011-04-11 14:25:44 -07:00
Mike Lockwood
9e13c7e5d7
am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
...
* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
UsbManager: minor Javadoc tweak
2011-04-11 14:24:11 -07:00
Jason parks
f953d3e2ea
am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
...
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089
am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
...
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
James Dong
6f2b5d614c
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
...
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
2011-04-11 14:23:52 -07:00
Jeff Brown
ec7b4b7a8c
Merge "Add a sprite controller."
2011-04-11 14:10:56 -07:00
Jeff Brown
5541de9ea3
Add a sprite controller.
...
Refactored PointerController to extract the surface management
code to a new component called a SpriteController so that it can
be used to move finger tracking spots around the screen as well.
The SpriteController is designed to fully decouple the client from
any latency introduced by surface transactions and drawing.
All sprite updates are performed asynchronously on the Looper using
a copy of the sprite state.
Added a stub SpotController implementation for touch pad UX.
It will be implemented in a subsequent patch.
Fixed a little bug in pointer orientation changes when entering
DISPLAY_ORIENTATION_90 the x offset was clobbered.
Change-Id: Ib25d162d577c9b354cb74d5d761c3c9f9f438d42
2011-04-11 14:08:29 -07:00
Stephen Hines
97837c9172
Fix broken assert (if input allocation is NULL).
...
Change-Id: If02e86eee4ec059402edd6f8c408fd89b248bc80
2011-04-11 14:02:22 -07:00
Glenn Kasten
4123211637
am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:49:03 -07:00
Glenn Kasten
a7e8385cb3
am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:46:38 -07:00
Glenn Kasten
87ee132ac5
am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:43:28 -07:00
Amith Yamasani
beb182a494
Merge "Package manager changes to store and update user information."
2011-04-11 12:14:17 -07:00
Amith Yamasani
4b2e934928
Package manager changes to store and update user information.
...
Some API stubs for managing users and storing their details.
List of users is stored in an xml file.
Each user's properties are stored in a separate xml file.
Some unit tests for modifying the XML files.
Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
2011-04-11 12:12:58 -07:00
Wink Saville
37e344cbe2
am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
...
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:11:14 -07:00
Wink Saville
1b00dc66d4
am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
...
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -07:00
Wink Saville
3156a8c169
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab
Move ProcessedMessage into HierarchicalStateMachine.
...
ProcessedMessage is really private to HSM and so moving
it into the HSM class.
Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
2011-04-11 11:51:28 -07:00
Freeman Ng
8e0cc73919
am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
...
* commit '2df36fd6ec39e096327032283d058b48be19e843':
Add prepaid data services URL to Secure Settings
2011-04-11 11:30:21 -07:00
Freeman Ng
2df36fd6ec
am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
...
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings
2011-04-11 11:19:18 -07:00
Freeman Ng
b7e8a54d98
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
2011-04-11 11:10:18 -07:00
Glenn Kasten
c6c2285b36
Enable HDCP debugging in Stagefright (1 of 2)
...
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
2011-04-11 11:07:53 -07:00
Andreas Huber
87312e9a81
If the media extractor specifies an invalid thumbnail time, default to the first frame.
...
Change-Id: I96514fa661d26726b4562872a5ebe87be88db71e
related-to-bug: 3447147
2011-04-11 10:57:29 -07:00
Jason Simmons
6eb3c59cfe
Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams."
2011-04-11 10:43:41 -07:00
Kenny Root
08d9d9a462
Merge "Runtime resource overlay, iteration 1."
2011-04-11 10:07:15 -07:00
Wink Saville
a58ee55f49
am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
...
* commit '6e797566650c10ba8655aea914d521f5999073e8':
Cleanup all functions overridden from DCT in GDCT
2011-04-09 08:05:31 -07:00
Wink Saville
6e79756665
am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
...
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT
2011-04-09 07:57:35 -07:00
Wink Saville
442b08bc7c
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
2011-04-09 07:50:37 -07:00
Mathias Agopian
5f05f99aae
Fix a GraphicBuffer leak in SurfaceTexture
...
This leak was intentional, it was there to deal with the fact that
some gralloc implementations don't track buffer handles with
file-descriptors so buffers needed to stay alive until there were
registered, which is not guaranteed by binder transactions.
In this new implementation, we use a small BBinder holding a
reference to the buffer, which with tuck into the parcel. This forces
the reference to stay alive until the parcel is destroyed, which
is guaranteed (by construction) to happen after the buffer is
registered.
this allows the public facing API to not expose the previous hack.
Change-Id: I1dd6cd83679a2b7457ad628169e2851acc027143
2011-04-08 19:28:04 -07:00
Elliott Hughes
7797e647fc
Merge "Tidy up exception throwing in the media native code."
2011-04-08 18:37:01 -07:00
Dianne Hackborn
bcbab36843
Merge "Rework thumbnails in activity manager."
2011-04-08 18:28:14 -07:00
Dianne Hackborn
f26fd99a7c
Rework thumbnails in activity manager.
...
We now only keep a thumbnail for the task, not for each
activity. However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
we will make a new secondary thumbnail for that series of
activities. There is a new API for the app to get these
secondary thumbnails.
Also set a default thumbnail size for non-xlarge screens
so we have thumbnails on phones. (We need some smarter
code in the platform for computing the actual thumbnail
dimensions of the current device). And add a test app
to show recent tasks + thumbnails.
Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
2011-04-08 18:16:21 -07:00
Bill Gruber
9a693ed987
Doc fix-corrects the cited download locations
...
Change-Id: I4225adb4162801b6cf5534dc4ed4f03e79a47e36
2011-04-08 17:55:17 -07:00
Jamie Gennis
0741b1ae22
am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:43:33 -07:00
Elliott Hughes
15dd15fd57
Tidy up exception throwing in the media native code.
...
(I'm going through all of frameworks/base in multiple passes. This pass is just
for exception throwing.)
Change-Id: Ia14a5c720edae86ac780023be88e676aa1b3315d
2011-04-08 17:42:34 -07:00
Jamie Gennis
0fb4e73f5f
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
3a9f5143ef
am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Robert Greenwalt
862da792c0
Cleanup all functions overridden from DCT in GDCT
...
Also removed use of iterator.
Change-Id: I58e505d641cc2b84b6522a6793665c2a3c839580
2011-04-08 17:36:39 -07:00
Robert Greenwalt
6cab9a6e3f
am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
...
* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
Make ApnSettings threadsafe.
2011-04-08 17:23:50 -07:00
Robert Greenwalt
da2790fa0a
am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
...
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
2011-04-08 17:21:43 -07:00
Robert Greenwalt
658779f5d8
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
2011-04-08 17:19:53 -07:00
Joe Onorato
d7c5e99c9b
Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier."
2011-04-08 17:10:57 -07:00
Robert Greenwalt
561538879b
Make ApnSettings threadsafe.
...
Also fixes getActiveApnString.
Change-Id: I2278b30505cc8a6be484341cba12d14f7b6316e8
2011-04-08 16:48:42 -07:00
Robert Greenwalt
2270d05698
am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
...
* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:44:42 -07:00
Robert Greenwalt
9e1e1360d3
am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
...
* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
Fix notification of disconnected networks.
2011-04-08 16:44:32 -07:00
Robert Greenwalt
ede9ed9f70
am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
...
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:38:39 -07:00
Robert Greenwalt
de78352c6c
am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
...
* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.
2011-04-08 16:38:34 -07:00
Robert Greenwalt
1eeeae59d0
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
2011-04-08 16:31:03 -07:00
Xia Wang
dddfaa75e7
Fix access point parsing: reset static link property after parsing
...
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi
Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
2011-04-08 16:31:01 -07:00
Robert Greenwalt
ac9c73ae61
Merge "Fix notification of disconnected networks." into honeycomb-LTE
2011-04-08 16:22:06 -07:00