IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.
MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.
Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.
android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.
MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
Merge commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6'
* commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6':
fix for [1969185] valgrind errors in new gl stuff
Merge commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153'
* commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153':
do not merge - add a big flag to turn off backup
Merge commit '8440ecce813112493d2af4097608735c4c7a870c'
* commit '8440ecce813112493d2af4097608735c4c7a870c':
Check if a searchable is null before adding it to the list of searchables
* changes:
Check if a searchable is null before adding it to the list of searchables for web search. If getActivityMetaData returned null for a web search searchable, previously, this null would get added to the list of searchables for web search, which was causing GlobalSearch's SearchSettings to crash with an NPE (which I've guarded against in change 6602).
Restore runs during the SetupWizard, before the phone is usable per se, so we
want to avoid presenting the usual "Application whatever has crashed..." dialog
to the user in the middle of that process. This change modifies the exception
handling around agent bringup so that agent-originated exceptions are caught and
a null agent binder reported to the backup manager.
There are three points during this code sequence at which an exception can be
thrown due to application-code error:
+ the app's manifest can name a nonexistent or malformed BackupAgent class,
incurring a VM-level exception like ClassNotFound or BadCast.
- the agent's onCreate() method could crash/throw.
- the agent's onBind() method could crash/throw.
The new code arrangement here puts a try/catch around all of these possible
failure points. When the code is invoked for backup, any caught exception is
merely rethrown. During restore, however, execution is allowed to proceed
through reporting the app's agent binder back to the activity manager. If any
exception was thrown, this reported binder will be null, i.e. a clean failure
notification to the backup manager.
What this code does *not* do at present is tear down the app when an exception
has been thrown. This is happens if the exception is allowed to propagate.
Doing so cleanly is problematic, however, in circumstances where mutiple apps
and agents share a process. Leaving the background process around until it is
torn down by the usual policies is probably the safer course at present.
Merge commit '8f7c7c0c18987b1045cb73e503f82ce429a0d924'
* commit '8f7c7c0c18987b1045cb73e503f82ce429a0d924':
Add a Gservices setting to set the rate at which the home page refreshes.
Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'
* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
wifi: WifiManager.startScan() will now do passive scans by default.
for web search. If getActivityMetaData returned null for a web search
searchable, previously, this null would get added to the list of searchables
for web search, which was causing GlobalSearch's SearchSettings to crash
with an NPE (which I've guarded against in change 6602).
Merge commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf'
* commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf':
Fix a small bug in array length bounds checking.
Active scans will only happen if a hidden AP is in use, or if the new method
WifiManager.startScanActive() is called.
This fixes some audio playback problems with bluetooth A2DP.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb'
* commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb':
Rename "no" arrays.xml file to be in the correct "nb" locale.
Merge commit 'ed7603779282d416356ce3c9739056d632307275'
* commit 'ed7603779282d416356ce3c9739056d632307275':
Add a persistent system property to disable the adb notification.
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'
* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
Adding a lock to stop so that stop will stop utterances
Merge commit '3bb692338fed7f34f010398fe8b831d0de22c6e8'
* commit '3bb692338fed7f34f010398fe8b831d0de22c6e8':
Keep Gears permissions in sync with system location settings.
Merge commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88'
* commit '313ea433d18e7fd5438b94c0606c496fcc7a2f88':
Make suggestion text color change based on the item state.
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'
* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
Move the watchdog timer to a separate thread...
