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

47272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
f309453bb8 am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'af64e751e2373790dd661be80b11a03332712e90':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:24:53 -07:00
Mike Lockwood
af64e751e2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
Teng-Hui Zhu
6b3c25c859 am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:23:38 -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
47b4299120 am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit 'a0215953b0a6930b0ca3dcbdd598e1b9de2e9f02':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:18:48 -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
Eric Fischer
c3a785cbc6 am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:36:38 -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
782ffe91da am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:31:09 -07:00
Gloria Wang
2c3257b21d am 9940c8b6: 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 '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
  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 12:30:52 -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
Brad Fitzpatrick
8698c91204 am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:36:47 -07:00
Paul Milovanov
074903a95b am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:29:50 -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
Brad Fitzpatrick
b8332786e3 am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
d973bed36c Merge "Removing dead store; it was likely a relict of debuging code." 2011-03-17 09:51:47 -07:00
Mike Lockwood
132b23f849 am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:28:26 -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
1b4890c968 am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '4502636629ebb3f2ebb8521241c364666d1d7345':
  Remove logspew.
 2011-03-17 06:35:54 -07: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
9cd93f09d4 am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1 
* commit 'ea775ca3ac793033e91b4d1cc05dfdb53ab807be':
  Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
 2011-03-17 01:39:44 -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
Jozef BABJAK
f1aa297b17 Removing dead store; it was likely a relict of debuging code. 
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
 2011-03-17 09:23:32 +01:00
Jeff Brown
e5feed7e5d am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 
* commit '244eb34a6712688fa87653dd3e2e2d05cd568eec':
  Fix dangling pointer when device closed just after opening.
 2011-03-17 01:02:28 -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
e22aa62362 am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out 
* commit '25594e1984125081878d2ea057700366a34a8ccf':
  fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
 2011-03-17 00:12:01 -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
a13640b9ef am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 
* commit '7a0949c60df2085fc38eea71d78f9c17eb26cd65':
  Support html5 video switching b/t full screen and inline mode
 2011-03-16 23:05:41 -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