Merge "Rename MediaUpdate to MediaComponents"
diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index 1a5f3dd..a777663 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -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 @@
std::shared_ptr<List<sp<ExtractorPlugin>>> newList(new List<sp<ExtractorPlugin>>());
- RegisterExtractors(kUpdateApkPath, *newList);
+ RegisterExtractors(kSystemApkPath, *newList);
if (newUpdateApkPath != nullptr) {
RegisterExtractors(newUpdateApkPath, *newList);
diff --git a/packages/MediaUpdate/Android.mk b/packages/MediaComponents/Android.mk
similarity index 97%
rename from packages/MediaUpdate/Android.mk
rename to packages/MediaComponents/Android.mk
index d56da67..2fa4a82 100644
--- a/packages/MediaUpdate/Android.mk
+++ b/packages/MediaComponents/Android.mk
@@ -18,7 +18,7 @@
include $(CLEAR_VARS)
-LOCAL_PACKAGE_NAME := MediaUpdate
+LOCAL_PACKAGE_NAME := MediaComponents
LOCAL_MODULE_OWNER := google
# TODO: create a separate key for this package.
diff --git a/packages/MediaUpdate/AndroidManifest.xml b/packages/MediaComponents/AndroidManifest.xml
similarity index 100%
rename from packages/MediaUpdate/AndroidManifest.xml
rename to packages/MediaComponents/AndroidManifest.xml
diff --git a/packages/MediaUpdate/proguard.cfg b/packages/MediaComponents/proguard.cfg
similarity index 100%
rename from packages/MediaUpdate/proguard.cfg
rename to packages/MediaComponents/proguard.cfg
diff --git a/packages/MediaUpdate/src/com/android/media/update/ApiFactory.java b/packages/MediaComponents/src/com/android/media/update/ApiFactory.java
similarity index 100%
rename from packages/MediaUpdate/src/com/android/media/update/ApiFactory.java
rename to packages/MediaComponents/src/com/android/media/update/ApiFactory.java
diff --git a/packages/MediaUpdate/src/com/android/media/update/ApiHelper.java b/packages/MediaComponents/src/com/android/media/update/ApiHelper.java
similarity index 100%
rename from packages/MediaUpdate/src/com/android/media/update/ApiHelper.java
rename to packages/MediaComponents/src/com/android/media/update/ApiHelper.java
diff --git a/packages/MediaUpdate/src/com/android/widget/MediaController2Impl.java b/packages/MediaComponents/src/com/android/widget/MediaController2Impl.java
similarity index 100%
rename from packages/MediaUpdate/src/com/android/widget/MediaController2Impl.java
rename to packages/MediaComponents/src/com/android/widget/MediaController2Impl.java
diff --git a/packages/MediaUpdate/src/com/android/widget/VideoView2Impl.java b/packages/MediaComponents/src/com/android/widget/VideoView2Impl.java
similarity index 100%
rename from packages/MediaUpdate/src/com/android/widget/VideoView2Impl.java
rename to packages/MediaComponents/src/com/android/widget/VideoView2Impl.java
diff --git a/packages/MediaUpdate/src/com/android/widget/VideoViewInterface.java b/packages/MediaComponents/src/com/android/widget/VideoViewInterface.java
similarity index 100%
rename from packages/MediaUpdate/src/com/android/widget/VideoViewInterface.java
rename to packages/MediaComponents/src/com/android/widget/VideoViewInterface.java
diff --git a/services/mediaextractor/Android.mk b/services/mediaextractor/Android.mk
index b6de7e3..4980316 100644
--- a/services/mediaextractor/Android.mk
+++ b/services/mediaextractor/Android.mk
@@ -21,7 +21,7 @@
# extractor libraries
LOCAL_REQUIRED_MODULES := \
- MediaUpdate \
+ MediaComponents \
LOCAL_SRC_FILES := main_extractorservice.cpp
LOCAL_SHARED_LIBRARIES := libmedia libmediaextractorservice libbinder libutils \