- 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
Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e'
* commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp
* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp
* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
docs: fix a couple api links
ExpandableListViewBasicTest
A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.
Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
The Bluetooth Headset spec doesn't cover all cases.
For example, there is nothing defined to show the battery status of
the headset on the phone. This intent allows 3rd party applications
to communicate effectively with vendor headsets. For example, Plantronics
has an app for Android headsets and when used with Plantronics
headsets, they will be able to use extra information from the headset.
Change-Id: Ib997327103cbbe57d64c52ba27f74162b6769798
Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'
* commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp
* commit '89821204379816f6bee6902c4f132c014700c3b0':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Also removed call to obsolete openTagConnection() method which was crashing.
Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
If a list adapter's content changes while the ListView is detached
from a window, the data change is not registered and the next
layoutChildren call causes the ListView to detect a bad change that
the adapter did not notify ListView about. Any time a ListView becomes
attached to a window, has a valid adapter, and no attached data set
observer, treat it as a data set changed event.
Change-Id: Ic00c05a1a0d063399dc78d5d877e3d5f9b1bee16
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
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp
* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #3126018: No way to specify NativeActivity's native method
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