Merge commit '264348361e0660948a09fe516a535b7c60998def'
* commit '264348361e0660948a09fe516a535b7c60998def':
GPS: Initialize XTRA support when GPS is enabled
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp
* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
GPS: Initialize XTRA support when GPS is enabled
Results in an approximately 60% reduction in InputDispatcher thread CPU time.
(Went from 3% to 1% when measured with CPU frequency scaling disabled.)
Change-Id: Ia6e6087a719ee518fe37b428a871c7240bd4143f
The MenuInflater returned by ActionModes will set the default
showAsAction value to "ifRoom" if not otherwise specified.
Change-Id: I86045dc4e877a97a3464a1a5f44d8d1e2120b086
* Fix a bug where the options panel would not open on non-xlarge
screens to show overflow menu items.
* Fix a bug where ActionBarView would try to add a custom nav view
twice.
* Fix a bug where ActionBarView would expand too far in wrap_content mode
Change-Id: I433ea56524aad885d813ae8743fe2fcefa9649fa
Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'
* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
Change the default time scale for audio/video track during recording
Merge commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2'
* commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2':
add an api for getting a device serial number
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'
* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
Fix problems with determining when to kill apps for wake usage.
Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'
* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
Use audio clock as the reference media clock
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41'
* commit 'b2c315ebe79359fa443533f9ab55e9b730938e41':
fix a typo that prevented glTexImage2D codepath to work
Merge commit '80810f86e93866674f3a4ca61f84887e7717aa63' into gingerbread-plus-aosp
* commit '80810f86e93866674f3a4ca61f84887e7717aa63':
Fix crash in status bar ticker.
Merge commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784' into gingerbread-plus-aosp
* commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784':
Change the default time scale for audio/video track during recording
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp
* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
add an api for getting a device serial number
Changed 9.xml to make update-api behave with the API change involved.
Several fields and methods moved from ListView to AbsListView. This
should not break source or binary compatibility.
Change-Id: Icad6e238522b8b7cc5bbc935ad89ac3e015572c1
and reduce rounding errors in calculating the sample duration
- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.
Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
