Merge change 7899

* changes:
  Fixing the build: StagefrightPlayer now implements the newly introduced "getMetadata" pure virtual.

media/libmediaplayerservice/StagefrightPlayer.cpp

@@ -205,4 +205,9 @@ void StagefrightPlayer::setAudioSink(const sp<AudioSink> &audioSink) {
     }
 }
 
+status_t StagefrightPlayer::getMetadata(
+        const SortedVector<MetadataType> &ids, Parcel *records) {
+    return INVALID_OPERATION;
+}
+
 }  // namespace android

media/libmediaplayerservice/StagefrightPlayer.h

@@ -48,6 +48,9 @@ public:
     virtual status_t invoke(const Parcel &request, Parcel *reply);
     virtual void setAudioSink(const sp<AudioSink> &audioSink);
 
+    virtual status_t getMetadata(
+            const SortedVector<MetadataType> &ids, Parcel *records);
+
 private:
     MediaPlayerImpl *mPlayer;