Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev am: 11eddd5a22 am: 9353b051f9

am: ff404db0d6

Change-Id: I5302de302163f2f341e770b7fd48df245554174e

media/libstagefright/httplive/M3UParser.cpp

@@ -234,7 +234,11 @@ bool M3UParser::MediaGroup::getActiveURI(AString *uri, const char *baseURL) cons
         if (mSelectedIndex >= 0 && i == (size_t)mSelectedIndex) {
             const Media &item = mMediaItems.itemAt(i);
 
-            *uri = item.makeURL(baseURL);
+            if (item.mURI.empty()) {
+                *uri = "";
+            } else {
+                *uri = item.makeURL(baseURL);
+            }
             return true;
         }
     }
@@ -465,7 +469,7 @@ bool M3UParser::getTypeURI(size_t index, const char *key, AString *uri) const {
         }
 
         if ((*uri).empty()) {
-            *uri = mItems.itemAt(index).mURI;
+            *uri = mItems.itemAt(index).makeURL(mBaseURI.c_str());
         }
     }