DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I1ec136a6b654655a0e78c3ee1d3c7f5557999652
diff --git a/Android.mk b/Android.mk
index 9d291e1..92e3679 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+ifneq ($(TARGET_BUILD_PDK), true)
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -39,3 +41,4 @@
include $(BUILD_PACKAGE)
+endif
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2c16f13..d3e9f5a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,6 +40,10 @@
<category android:name="android.intent.category.INFO" />
<category android:name="android.intent.category.APP_MUSIC" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.car.intent.action.MEDIA_TEMPLATE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
</application>
</manifest>
diff --git a/src/com/android/car/media/MediaManager.java b/src/com/android/car/media/MediaManager.java
index 2feb646..605d46f 100644
--- a/src/com/android/car/media/MediaManager.java
+++ b/src/com/android/car/media/MediaManager.java
@@ -72,7 +72,7 @@
* KEY_PACKAGE defined in ProjectionIntentStarter in GSA.
*/
public static final String KEY_MEDIA_PACKAGE_FROM_GSA =
- "android.intent.action.original_package";
+ "android.car.intent.extra.MEDIA_PACKAGE";
private static final String GOOGLE_PLAY_MUSIC_PACKAGE = "com.google.android.music";
// Extras along with the Knowledge Graph that are not meant to be seen by external apps.
