drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,458 Commits 1 Branch 0 Tags
Commit Graph

47458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
1c0e543638 UsbService: Handle the case where a USB accessory connects as the device is booting 
Bug: 4129297

Change-Id: I8f9d085805fb598572f9b00952c3cd38cfab461b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-19 12:03:46 -04:00
Eric Rowe
2b1fb45fab Clean up BT stress tests. 
Make ConnectPanReceiver a child of ConnectProfileReceiver, check if a
profile proxy is null before trying to connect.  Change log output in
bluetooth.  Remove some oververbose parameters from test runner. Make
the setup for the tests more consistent (delete pairings, etc).

Most of this work has been done to facilitate the tests created for
trade federation.

Change-Id: I7350d308b5d09c2052e0a3f3308a69c564ba4d74
 2011-03-18 20:13:11 -07:00
Jamie Gennis
b368f4d85d am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
 2011-03-18 17:34:27 -07:00
Jamie Gennis
38caff230d Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00
Jamie Gennis
6912daf5fa SurfaceFlinger: Fix a typo. 
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.

Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
 2011-03-18 16:35:13 -07:00
Russell Brenner
e68dc1576f am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491" into honeycomb-mr1 
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
  DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
 2011-03-18 15:32:18 -07:00
Russell Brenner
a0dc8da2ab Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491" into honeycomb-mr1 2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
eb52fb3229 am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1 
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
  Asset for video poster
 2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
7eaf483140 Merge "Asset for video poster" into honeycomb-mr1 2011-03-18 15:19:28 -07:00
Teng-Hui Zhu
70455a194e Asset for video poster 
bug:4136024

Change-Id: I2b847948446285a2121578a4809f90a48d0c6019
 2011-03-18 15:01:34 -07:00
Romain Guy
64929b4909 DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. 
Bug #3275491

These can be used by WebView to correctly apply alpha and geometric
transforms.

Change-Id: I61057997f5fda1e803d247fc77500a038d5f3aab
 2011-03-18 14:39:20 -07:00
Yu Shan Emily Lau
75afb97c4d Add the mem logging into test utility. 
Bug# 4108259

Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
 2011-03-18 13:27:51 -07:00
Daisuke Miyakawa
10221a22dd am b02d3956: am e16a1bfa: Use system locale list. 
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
  Use system locale list.
 2011-03-18 11:27:22 -07:00
Daisuke Miyakawa
b02d395650 am e16a1bfa: Use system locale list. 
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
  Use system locale list.
 2011-03-18 11:23:00 -07:00
Derek Sollenberger
25dad8eda1 am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
  Prevent intermediate scale updates from being sent to WebKit while zooming.
 2011-03-18 11:02:45 -07:00
shailendra
a5eaf2eae0 am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
 2011-03-18 11:02:35 -07:00
Derek Sollenberger
5750bb7d8f Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1 2011-03-18 10:57:46 -07:00
shailendra
d0c2813289 Fix for testPropertiesWMVFile case failed with build HMI75B(4128259) 
Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
 2011-03-18 10:45:29 -07:00
Derek Sollenberger
a249a93e8d Prevent intermediate scale updates from being sent to WebKit while zooming. 
The addition of the HW accelerated logic causes us to manipulate the
zoom scale factor in the zoom manager two additional times. These
manipulations occur after the mZoomScale has been set to zero is how we
previously tested to see if a fixed length animation was occuring.

bug: 3451126
Change-Id: If2992adbe36fa471bb1bb5013495e1adc74b5fab
 2011-03-18 12:48:36 -04:00
shailendra
0d922ec92d Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 2011-03-18 09:35:37 -07:00
Daisuke Miyakawa
e16a1bfa9c Use system locale list. 
Context's assets may be different from system's. We should
prefer system's to reflect PRODUCT_LOCALE.

Bug: 4104675
Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319
 2011-03-17 19:56:13 -07:00
Dianne Hackborn
efb56934ef am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:02:15 -07:00
Dianne Hackborn
1d50ad7914 Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 2011-03-17 19:00:56 -07:00
Dianne Hackborn
edf1fc6ce6 Whoops, forgot the HONEYCOMB_MR1 constant. :( 
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.

This is important for the SDK.

Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
 2011-03-17 18:34:48 -07:00
Huahui Wu
d1e89c412f am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:11:04 -07:00
Huahui Wu
b1c43c32f5 Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 2011-03-17 18:09:33 -07:00
Wink Saville
94191d4349 am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1 
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
  Change stopship to todo.
 2011-03-17 18:00:55 -07:00
Wink Saville
651f38d717 Merge "Change stopship to todo." into honeycomb-mr1 2011-03-17 17:58:06 -07:00
Justin Ho
dd8f926841 am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 17:55:58 -07:00
James Dong
970bad6775 am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
  Fix missing AOSP copyright headers for more files
 2011-03-17 17:55:48 -07:00
Huahui Wu
88b869a40a b/4116658 Fix the jumpy scrolling with some flash site. 
In the case that a touch event is passed to WebKit then back to
WebView, the coordinates will be converted from view to content
then back to view and the convertion could lose some accuracies.
For a flash content that only consumes TouchDown, all the
TouchMove events will go through this path and each time, the
data becomes more inaccurate. Even worse, the TouchMove event
updates the mScrollX/Y which will then be used for the convertion.
The effect amplifies really quick and the scrolling looks jumpy.

The fix is just to store the original view coordinates when pass
the event around.

Change-Id: Ie1424d7cfc6272348b194732e97168efe2dcf17b
 2011-03-17 17:42:12 -07:00
Wink Saville
e5d6e10a73 Change stopship to todo. 
For MR1 LTE isn't supported so the various lte routines aren't used
and are not a stopship.

bug: 4126216
Change-Id: I2a5f86161b616b57c6fe4b9de85db2492914009a
 2011-03-17 16:50:42 -07:00
Justin Ho
5dbd0978cd Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 2011-03-17 16:49:32 -07:00
James Dong
be368de7b7 Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 2011-03-17 16:11:13 -07:00
shailendra
c8b4efdd74 Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235) 
Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
 2011-03-17 14:53:20 -07:00
James Dong
199d1c131d Fix missing AOSP copyright headers for more files 
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
  because these two files were moved from other places to the current location,
  and were actually created in 2010.

bug - 4119349

Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
 2011-03-17 14:43:12 -07:00
Teng-Hui Zhu
0318d6bfd3 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
73091273bb Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 2011-03-17 14:20:39 -07:00
Xavier Ducrohet
a0215953b0 am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:15:38 -07:00
Xavier Ducrohet
026d6be2dc Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 2011-03-17 14:12:49 -07:00
Xavier Ducrohet
67450db03e LayoutLib: TypedArray.getDimensionPixelSize can actually return <0 
Change-Id: I17853dc242e28f0c59916cad1b2a57beed480a57
 2011-03-17 14:11:23 -07:00
Teng-Hui Zhu
1ab0df7f5a Fix the aspect ratio for full screen playing 
bug:4116475

Change-Id: I0b04ef4a6db24a9bc5c8d0f0a987783695bc3489
 2011-03-17 13:36:33 -07:00
Eric Fischer
b05fea7dc5 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:32:58 -07:00
Eric Fischer
e6ef8d0b75 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-17 13:29:47 -07:00
Eric Fischer
00436f9bfb Import revised translations. DO NOT MERGE 
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
 2011-03-17 13:11:01 -07:00
James Dong
9c0c5b5638 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 11:56:05 -07:00
James Dong
2f1f2248c8 Fix missing AOSP copyright headers for a bunch of media framework files 
bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
 2011-03-17 11:10:40 -07:00
Gloria Wang
9940c8b6c8 am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 10:54:00 -07:00
Gloria Wang
def35f7a47 Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 2011-03-17 10:49:43 -07:00
Paul Milovanov
eca7ff02fb am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:26:32 -07:00