OSDN Git Service

android-x86/frameworks-native.git
13 years agoam 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging...
Neal Nguyen [Sat, 30 Oct 2010 00:10:12 +0000 (17:10 -0700)]
am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread

* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
  A little tweaking of DL Manager tests and adding better debugging output.

13 years agoMerge "A little tweaking of DL Manager tests and adding better debugging output....
Neal Nguyen [Sat, 30 Oct 2010 00:07:59 +0000 (17:07 -0700)]
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread

13 years agoam 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into...
Scott Main [Fri, 29 Oct 2010 22:37:17 +0000 (15:37 -0700)]
am 6e8d6bd0: Merge "docs: Update various SDK docs for GB  platform and tools" into gingerbread

* commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136':
  docs: Update various SDK docs for GB  platform and tools

13 years agoMerge "docs: Update various SDK docs for GB platform and tools" into gingerbread
Scott Main [Fri, 29 Oct 2010 22:34:00 +0000 (15:34 -0700)]
Merge "docs: Update various SDK docs for GB  platform and tools" into gingerbread

13 years agoam 5ccbe059: DO NOT MERGE. Add assets for <select>
Leon Clarke [Fri, 29 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am 5ccbe059: DO NOT MERGE. Add assets for <select>

* commit '5ccbe05945325dc77d543d44b69a7f80196d8cb9':
  DO NOT MERGE. Add assets for <select>

13 years agoam 1112632a: Merge "docs: revise javadocs for sip add a package description, revise...
Scott Main [Fri, 29 Oct 2010 17:24:04 +0000 (10:24 -0700)]
am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread

* commit '1112632a41462c5dd34c7af9f67b88188a520517':
  docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs

13 years agoMerge "docs: revise javadocs for sip add a package description, revise class descript...
Scott Main [Fri, 29 Oct 2010 17:03:36 +0000 (10:03 -0700)]
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread

13 years agoam ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed...
Joe Onorato [Fri, 29 Oct 2010 15:16:20 +0000 (08:16 -0700)]
am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread

* commit 'ed3c7be84255d48fe7f0454bdd51b3955698cafe':
  Report the new size to wallpapers when the requested size changed.

13 years agoam 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
Nick Pelly [Fri, 29 Oct 2010 15:15:48 +0000 (08:15 -0700)]
am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread

* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
  Hide some NFC API's.

13 years agoMerge "Report the new size to wallpapers when the requested size changed." into ginge...
Joe Onorato [Fri, 29 Oct 2010 01:18:52 +0000 (18:18 -0700)]
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread

13 years agoMerge "Hide some NFC API's." into gingerbread
Nick Pelly [Thu, 28 Oct 2010 23:47:31 +0000 (16:47 -0700)]
Merge "Hide some NFC API's." into gingerbread

13 years agoam c9fa90f9: Merge "GPS: remove some logging" into gingerbread
Mike Lockwood [Thu, 28 Oct 2010 21:30:34 +0000 (14:30 -0700)]
am c9fa90f9: Merge "GPS: remove some logging" into gingerbread

* commit 'c9fa90f94b664589d584bb433e748e2b01b368c9':
  GPS: remove some logging

13 years agoMerge "GPS: remove some logging" into gingerbread
Mike Lockwood [Thu, 28 Oct 2010 21:28:46 +0000 (14:28 -0700)]
Merge "GPS: remove some logging" into gingerbread

13 years agoam bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds."...
Jeff Hamilton [Thu, 28 Oct 2010 21:03:40 +0000 (14:03 -0700)]
am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread

* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
  DO NOT MERGE. Fix asset file descriptor for pipe based fds.

13 years agoMerge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 21:01:21 +0000 (14:01 -0700)]
Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread

13 years agoam 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)
Justin Ho [Thu, 28 Oct 2010 17:30:10 +0000 (10:30 -0700)]
am 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)

* commit '9112b8ebd22ce5c83081066bea8a424eda8bda9d':
  DO NOT MERGE - Ringtone bugfixes (round 1)

13 years agoam 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expec...
Mathias Agopian [Thu, 28 Oct 2010 06:46:25 +0000 (23:46 -0700)]
am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread

13 years agoMerge "really fix [3118445] Transform * Transform does not work as expected" into...
Mathias Agopian [Thu, 28 Oct 2010 06:44:07 +0000 (23:44 -0700)]
Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread

13 years agoam 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send...
Jaikumar Ganesh [Thu, 28 Oct 2010 06:44:02 +0000 (23:44 -0700)]
am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread

13 years agoMerge "DO NOT MERGE Fix auto connection with headsets which don't send incoming conne...
Jaikumar Ganesh [Thu, 28 Oct 2010 06:42:43 +0000 (23:42 -0700)]
Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread

13 years agoam 120a4594: Drop all dispatcher state when dispatcher is disabled.
Jeff Brown [Thu, 28 Oct 2010 02:31:24 +0000 (19:31 -0700)]
am 120a4594: Drop all dispatcher state when dispatcher is disabled.

13 years agoDrop all dispatcher state when dispatcher is disabled.
Jeff Brown [Thu, 28 Oct 2010 01:43:51 +0000 (18:43 -0700)]
Drop all dispatcher state when dispatcher is disabled.

This patch makes the dispatcher drop all of its state when it is
disabled (when the screen turns off).  This ensures that the dispatcher
does not get stuck thinking a pointer is still down if the screen
turned off while the user was touching the display (such as a fat touch
while hitting the power button).

Bug: 3098344
Change-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d

13 years agoreally fix [3118445] Transform * Transform does not work as expected
Mathias Agopian [Tue, 26 Oct 2010 01:29:35 +0000 (18:29 -0700)]
really fix [3118445] Transform * Transform does not work as expected

Two bugs were counter acting each other.
- rotation matrices are on the left-hand side of multiplies
- the transform of the overlay is applied before that of the layer

Change-Id: Ia79bd368e9b719235c89ecf244ea263f01ce906a

13 years agoam aa93bcd6: Fix issue #3138926: App\'s preferences can be lost after onPause()
Dianne Hackborn [Wed, 27 Oct 2010 21:59:28 +0000 (14:59 -0700)]
am aa93bcd6: Fix issue #3138926: App\'s preferences can be lost after onPause()

13 years agoam 001c7d12: Merge "Set capabilities sooner." into gingerbread
Andy McFadden [Wed, 27 Oct 2010 20:25:29 +0000 (13:25 -0700)]
am 001c7d12: Merge "Set capabilities sooner." into gingerbread

13 years agoMerge "Set capabilities sooner." into gingerbread
Andy McFadden [Wed, 27 Oct 2010 20:22:50 +0000 (13:22 -0700)]
Merge "Set capabilities sooner." into gingerbread

13 years agoam 63e5d07e: Merge "Fix issue with project resources overriding framework resources...
Xavier Ducrohet [Wed, 27 Oct 2010 18:23:58 +0000 (11:23 -0700)]
am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread

13 years agoMerge "Fix issue with project resources overriding framework resources." into gingerbread
Xavier Ducrohet [Wed, 27 Oct 2010 18:22:22 +0000 (11:22 -0700)]
Merge "Fix issue with project resources overriding framework resources." into gingerbread

13 years agoam 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to...
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:14:36 +0000 (11:14 -0700)]
am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread

13 years agoMerge "Add the mediaplayer release in the test validation. This is to ensure the...
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:12:58 +0000 (11:12 -0700)]
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread

13 years agoam 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/313751...
Marco Nelissen [Wed, 27 Oct 2010 18:08:14 +0000 (11:08 -0700)]
am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread

13 years agoMerge "Fix off-by-two and other bugs in the visualization code. b/3137511" into ginge...
Marco Nelissen [Wed, 27 Oct 2010 18:06:39 +0000 (11:06 -0700)]
Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread

13 years agoam 6d55e134: Make best effort attempt to recover NFC service when it dies.
Nick Pelly [Wed, 27 Oct 2010 17:43:19 +0000 (10:43 -0700)]
am 6d55e134: Make best effort attempt to recover NFC service when it dies.

13 years agoam 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless...
Andreas Huber [Tue, 26 Oct 2010 23:23:54 +0000 (16:23 -0700)]
am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread

13 years agoMerge "Assume that all of the decoded vorbis audio data is valid unless the source...
Andreas Huber [Tue, 26 Oct 2010 23:21:47 +0000 (16:21 -0700)]
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread

13 years agoam 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications...
Justin Ho [Tue, 26 Oct 2010 23:08:13 +0000 (16:08 -0700)]
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

13 years agoMerge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into ginger...
Justin Ho [Tue, 26 Oct 2010 23:06:28 +0000 (16:06 -0700)]
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

13 years agoam 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format...
Mathias Agopian [Tue, 26 Oct 2010 19:22:12 +0000 (12:22 -0700)]
am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

13 years agoam 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:48 +0000 (12:19 -0700)]
am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread

13 years agoam a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:43 +0000 (12:19 -0700)]
am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread

13 years agoMerge "Updade Surface (ANativeWindow) format based on its buffers format" into ginger...
Mathias Agopian [Tue, 26 Oct 2010 19:18:32 +0000 (12:18 -0700)]
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

13 years agoMerge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:19 +0000 (12:18 -0700)]
Merge "add format parameter to setBufferGeometry" into gingerbread

13 years agoMerge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread

13 years agoam d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:16:10 +0000 (12:16 -0700)]
am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread

13 years agoMerge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread

13 years agoam 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into...
Xavier Ducrohet [Tue, 26 Oct 2010 19:10:28 +0000 (12:10 -0700)]
am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread

13 years agoMerge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:09:18 +0000 (12:09 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread

13 years agoam 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into...
Justin Ho [Tue, 26 Oct 2010 16:11:12 +0000 (09:11 -0700)]
am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread

13 years agoMerge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:09:22 +0000 (09:09 -0700)]
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread

13 years agoam 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering...
Mike Lockwood [Tue, 26 Oct 2010 15:36:24 +0000 (08:36 -0700)]
am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

13 years agoMerge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 15:34:32 +0000 (08:34 -0700)]
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

13 years agoam 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:14:48 +0000 (08:14 -0700)]
am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread

13 years agoMerge "Partial fix for issue 3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue 3124895." into gingerbread

13 years agoam 79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:24:57 +0000 (07:24 -0700)]
am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread

13 years agoam 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part...
Joe Onorato [Tue, 26 Oct 2010 14:24:41 +0000 (07:24 -0700)]
am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread

13 years agoMerge "Make some contructors public but hidden." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread

13 years agoMerge "Don't turn the button backlights on if the screen is off. Part 2." into ginger...
Joe Onorato [Tue, 26 Oct 2010 01:48:08 +0000 (18:48 -0700)]
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread

13 years agoMerge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into ginger...
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:28:29 +0000 (17:28 -0700)]
Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp

13 years agoresolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:27:16 +0000 (17:27 -0700)]
resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp

Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8

13 years agoam 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK...
Scott Main [Tue, 26 Oct 2010 00:23:10 +0000 (17:23 -0700)]
am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items

Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos

13 years agoam c9ac1079: update featured videos also remove "new" tags from SDK and Resources...
Scott Main [Tue, 26 Oct 2010 00:15:50 +0000 (17:15 -0700)]
am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items

Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos

13 years agoUpdade Surface (ANativeWindow) format based on its buffers format
Mathias Agopian [Mon, 25 Oct 2010 23:29:24 +0000 (16:29 -0700)]
Updade Surface (ANativeWindow) format based on its buffers format

this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d

13 years agoam 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Justin Ho [Mon, 25 Oct 2010 23:50:34 +0000 (16:50 -0700)]
am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread

Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo

13 years agoMerge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread

13 years agoMerge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into ginger...
Gloria Wang [Mon, 25 Oct 2010 23:39:11 +0000 (16:39 -0700)]
Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp

13 years agoam 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Joe Malin [Mon, 25 Oct 2010 23:22:46 +0000 (16:22 -0700)]
am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread

Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package

13 years agoam 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 25 Oct 2010 23:19:42 +0000 (16:19 -0700)]
am 3d1ce9ec: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Doc Change: Revert NotePad sample test package" into gingerbread
Joe Malin [Mon, 25 Oct 2010 23:19:18 +0000 (16:19 -0700)]
Merge "Doc Change: Revert NotePad sample test package" into gingerbread

13 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 25 Oct 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

13 years agoresolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Gloria Wang [Mon, 25 Oct 2010 22:23:04 +0000 (15:23 -0700)]
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp

Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472

13 years agofix eglChooseConfig() for special attributes.
Mathias Agopian [Mon, 25 Oct 2010 22:51:24 +0000 (15:51 -0700)]
fix eglChooseConfig() for special attributes.

affects software renderer (emu) only.

per EGL spec:
  If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
  EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are speciļ¬ed
  in attrib list, then they are ignored

Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6

13 years agoMerge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
Jean-Baptiste Queru [Mon, 25 Oct 2010 22:32:12 +0000 (15:32 -0700)]
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"

13 years agoam 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Jeff Hamilton [Mon, 25 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread

Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.

13 years agoMerge "Add a RHS status bar slot for NFC." into gingerbread
Jeff Hamilton [Mon, 25 Oct 2010 21:46:45 +0000 (14:46 -0700)]
Merge "Add a RHS status bar slot for NFC." into gingerbread

13 years agoam 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread
Mike Lockwood [Mon, 25 Oct 2010 20:55:27 +0000 (13:55 -0700)]
am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread

Merge commit '8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp

* commit '8c32bddfac259543f4ed87341fce42bc5ed60506':
  GPS: Disable verbose logging

13 years agoMerge "GPS: Disable verbose logging" into gingerbread
Mike Lockwood [Mon, 25 Oct 2010 20:49:13 +0000 (13:49 -0700)]
Merge "GPS: Disable verbose logging" into gingerbread

13 years agoam 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following...
Mathias Agopian [Mon, 25 Oct 2010 20:38:15 +0000 (13:38 -0700)]
am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread

Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp

* commit '457bed2bc6561dd67429dde238453fee8602fa9b':
  fix [3123221] Video sticks playing back upside down following orientation switch

13 years agoam ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected...
Mathias Agopian [Mon, 25 Oct 2010 20:38:11 +0000 (13:38 -0700)]
am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread

Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp

* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
  fix [3118445] Transform * Transform does not work as expected

13 years agoMerge "fix [3123221] Video sticks playing back upside down following orientation...
Mathias Agopian [Mon, 25 Oct 2010 20:31:11 +0000 (13:31 -0700)]
Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread

13 years agoMerge "fix [3118445] Transform * Transform does not work as expected" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:31:03 +0000 (13:31 -0700)]
Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread

13 years agoMerge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMEx...
Gloria Wang [Mon, 25 Oct 2010 19:23:35 +0000 (12:23 -0700)]
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for   DRM audio/video playback"

13 years agoam 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableList...
Adam Powell [Mon, 25 Oct 2010 19:07:51 +0000 (12:07 -0700)]
am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test

13 years agoMerge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest...
Adam Powell [Mon, 25 Oct 2010 18:43:03 +0000 (11:43 -0700)]
Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

13 years agoam abb50f15: Merge "docs: fix a couple api links" into gingerbread
Scott Main [Mon, 25 Oct 2010 18:27:55 +0000 (11:27 -0700)]
am abb50f15: Merge "docs: fix a couple api links" into gingerbread

Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links

13 years agoMerge "docs: fix a couple api links" into gingerbread
Scott Main [Mon, 25 Oct 2010 18:18:28 +0000 (11:18 -0700)]
Merge "docs: fix a couple api links" into gingerbread

13 years agoam 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Nick Pelly [Mon, 25 Oct 2010 16:09:37 +0000 (09:09 -0700)]
am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread

Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp

* commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
  Fixed NdefTag parcelable conversion methods.

13 years agoam 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not...
Wu-cheng Li [Mon, 25 Oct 2010 16:09:26 +0000 (09:09 -0700)]
am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread

Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp

* commit '89821204379816f6bee6902c4f132c014700c3b0':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge

13 years agoMerge "Fixed NdefTag parcelable conversion methods." into gingerbread
Nick Pelly [Mon, 25 Oct 2010 15:58:00 +0000 (08:58 -0700)]
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread

13 years agoMerge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into...
Wu-cheng Li [Mon, 25 Oct 2010 15:55:54 +0000 (08:55 -0700)]
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread

13 years agoam 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Nick Pelly [Mon, 25 Oct 2010 05:11:52 +0000 (22:11 -0700)]
am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread

Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().

13 years agoMerge "Document getPollBytes() and getActivationBytes()." into gingerbread
Nick Pelly [Mon, 25 Oct 2010 05:06:15 +0000 (22:06 -0700)]
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread

13 years agofix [3123221] Video sticks playing back upside down following orientation switch
Mathias Agopian [Mon, 25 Oct 2010 02:03:58 +0000 (19:03 -0700)]
fix [3123221] Video sticks playing back upside down following orientation switch

the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.

Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c

13 years agoam 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native...
Dianne Hackborn [Mon, 25 Oct 2010 01:38:11 +0000 (18:38 -0700)]
am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method

13 years agoMerge "Fix issue #3126018: No way to specify NativeActivity's native method" into...
Dianne Hackborn [Mon, 25 Oct 2010 01:33:36 +0000 (18:33 -0700)]
Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread

13 years agofix [3118445] Transform * Transform does not work as expected
Mathias Agopian [Sun, 24 Oct 2010 21:53:05 +0000 (14:53 -0700)]
fix [3118445] Transform * Transform does not work as expected

The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.

We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.

Also added a simple test for Transform.

Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227

13 years agoam 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into...
Jeff Brown [Sun, 24 Oct 2010 21:31:41 +0000 (14:31 -0700)]
am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread

Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp

* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
  Add unit tests for native input and fix bugs identified.

13 years agoMerge "Add unit tests for native input and fix bugs identified." into gingerbread
Jeff Brown [Sun, 24 Oct 2010 21:18:19 +0000 (14:18 -0700)]
Merge "Add unit tests for native input and fix bugs identified." into gingerbread

13 years agoam 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons...
Joe Onorato [Sun, 24 Oct 2010 16:25:49 +0000 (09:25 -0700)]
am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.

Merge commit '60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp

* commit '60607a9012c9b7d39bef8fcf0284772f1b061efc':
  Make sure that when the screen is off, we don't try to turn the buttons on too.

13 years agoMerge "Introduce a list of all the audio files" into gingerbread-plus-aosp
Jean-Baptiste Queru [Sun, 24 Oct 2010 12:26:09 +0000 (05:26 -0700)]
Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp

13 years agoAdd unit tests for native input and fix bugs identified.
Jeff Brown [Wed, 20 Oct 2010 22:33:38 +0000 (15:33 -0700)]
Add unit tests for native input and fix bugs identified.

Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.

Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP.  In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.

Improved motion event validation to check for duplicate pointer ids.

Added an input source constant that was missing from the NDK api but
defined in the framework api.

Added a timestamp when reporting added/removed devices in EventHub.

Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56