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

47227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Paul Milovanov
87f50f19ee Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 2011-03-17 10:23:48 -07:00
Mike Lockwood
c97022e7ac am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:26:44 -07:00
Mike Lockwood
11473332b4 Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 2011-03-17 07:24:12 -07:00
Mike Lockwood
a3f8514492 MtpServer: Do not attempt to stop MTP if it has not been started 
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.

Bug: 4118033

Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-17 09:43:50 -04:00
Daniel Sandler
4502636629 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
  Remove logspew.
 2011-03-17 06:31:56 -07:00
Daniel Sandler
8f5cab8b31 Merge "Remove logspew." into honeycomb-mr1 2011-03-17 06:23:45 -07:00
Adam Powell
ea775ca3ac am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:38:15 -07:00
Adam Powell
f8d1533b07 Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 2011-03-17 01:36:47 -07:00
Adam Powell
d0197f3669 Fix bug 4111271 and bug 4077526 - WebView touch event handling when 
WebCore is too slow

Make sure that we can recover properly from a bad gesture with missing
events that never come back from webcore. Lower timeout to 1 second.

Confirm movement on touch event enqueue so that we don't get phantom
taps or long presses when webcore is slow to respond.

Add sanity check in ScaleGestureDetector to end a gesture early on a
bad MotionEvent stream rather than throwing up.

Change-Id: I69690409d7edd6b4320dbcf3b052aba4023360fe
 2011-03-17 01:32:17 -07:00
Jeff Brown
244eb34a67 am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 
* commit 'd98f8aff731123eef1f0a8bc8bfc917647d5ac3a':
  Fix dangling pointer when device closed just after opening.
 2011-03-17 01:00:36 -07:00
Jeff Brown
d98f8aff73 Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 2011-03-17 00:59:08 -07:00
Jeff Brown
8e9d4431d6 Fix dangling pointer when device closed just after opening. 
Bug: 4088239
Change-Id: I210b918370357560a5ace8ea8dd7601255487e88
 2011-03-17 00:36:35 -07:00
Mathias Agopian
25594e1984 am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out 
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2':
  fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
 2011-03-17 00:10:10 -07:00
Mathias Agopian
f40e638ec6 fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out 
a memory corruption happned when the buffer pool was resized
(like when playing a video or using camera) and there was
no current active buffer. In this case, the faulty code
would index into an array at position -1 which corrupted
24 bytes of data.

also improved region validation code (ifdef'ed out by default)

Bug: 4093196
Change-Id: I915c581d131148959d720e00e3892e9186ab733d
 2011-03-17 00:04:42 -07:00
Paul Milovanov
a57db345d3 PACKAGE_FIRST_LAUNCH intent sent to wrong pkg 
In PackageManagerService, intent with ACTION_PACKAGE_FIRST_LAUNCH was
being sent to wrong package. It was being sent to the installed
package with installer package in the URI, whereas it should be sent
to installer package with installed package in the URI.
Comment in Intent.java:1417 seems to support that intent with this
action should be sent to the installer package, not installed.

Bug: 3426299
Change-Id: Iadec4ae7a1af6bab434716f8fcdb7d0b099d1ee1
 2011-03-16 23:12:31 -07:00
Teng-Hui Zhu
7a0949c60d am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
7af7e00b91 Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 2011-03-16 23:01:03 -07:00
Teng-Hui Zhu
10ab654943 Support html5 video switching b/t full screen and inline mode 
bug:2126902

Change-Id: I5c4b25358c76e35f0f51794d6d04fcc5098a0d70
 2011-03-16 22:06:28 -07:00
Bart Sears
247820c0a7 am 8e42d39f: Merge "partial inval" into honeycomb-mr1 
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
  partial inval
 2011-03-16 21:50:52 -07:00
Bart Sears
8e42d39f0b Merge "partial inval" into honeycomb-mr1 2011-03-16 21:49:09 -07:00
Gloria Wang
f8bf3c46f5 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

Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
 2011-03-16 21:36:30 -07:00
Alex Sakhartchouk
8f6c5226c5 am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1 
* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
  Fix for bug 3434228
 2011-03-16 21:18:37 -07:00
Alex Sakhartchouk
55a9be3d28 Merge "Fix for bug 3434228" into honeycomb-mr1 2011-03-16 21:16:31 -07:00
Alex Sakhartchouk
2c74ad9aae Fix for bug 3434228 
Change-Id: I57973faf782b487e7913a096f0ab6012dc1c9415
 2011-03-16 19:28:25 -07:00
Adam Cohen
afcb65c2fd am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
  Catching all Exceptions when calling through to RemoteViewsFactory
 2011-03-16 18:03:23 -07:00
Adam Cohen
296c1616ba Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 2011-03-16 18:02:08 -07:00
Romain Guy
b0204d0a27 am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 
* commit 'c2b91a6113c30d3b994ef081fbd5b941200d55a4':
  Modify the GL renderer's functor to pass the clip to WebView
 2011-03-16 17:26:41 -07:00
Romain Guy
c2b91a6113 Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1 2011-03-16 17:24:32 -07:00
Eric Fischer
c657fcce45 am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1 Import revised translations. DO NOT MERGE 
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
 2011-03-16 16:48:09 -07:00
Yu Shan Emily Lau
797f5b0c00 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:43:04 -07:00