Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa506590 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Rename MediaUpdate to MediaComponents"

parents 13fca0cd 73a2b25f

media/libstagefright/MediaExtractorFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


namespace android {



static const char *kUpdateApkPath = "/system/app/MediaUpdate/MediaUpdate.apk";

static const char *kSystemApkPath = "/system/app/MediaComponents/MediaComponents.apk";



// static

sp<IMediaExtractor> MediaExtractorFactory::Create(
@@ -297,7 +297,7 @@ void MediaExtractorFactory::UpdateExtractors(const char *newUpdateApkPath) { 


    std::shared_ptr<List<sp<ExtractorPlugin>>> newList(new List<sp<ExtractorPlugin>>());



    RegisterExtractors(kUpdateApkPath, *newList);

    RegisterExtractors(kSystemApkPath, *newList);



    if (newUpdateApkPath != nullptr) {

        RegisterExtractors(newUpdateApkPath, *newList);

packages/MediaUpdate/Android.mk→packages/MediaComponents/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) 


include $(CLEAR_VARS)



LOCAL_PACKAGE_NAME := MediaUpdate

LOCAL_PACKAGE_NAME := MediaComponents

LOCAL_MODULE_OWNER := google



# TODO: create a separate key for this package.