commit 27aecb2db2d716dcdcb6d84e578db14715d54607
author Pavel Maltsev <pavelm@google.com> Fri Apr 29 17:49:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 29 17:49:54 2016 +0000
tree 0fc07729570cd11fae2122a84481d0ca26a6e16f
parent ed4c98cb350e3fb7d274012694dc4c20a849b0f3
parent 1f1d00b8d9ecaa65bd48ea4418973d76d17d266d

Merge "Fix context in renderer#onStart method" into nyc-car-dev

service/AndroidManifest.xml

diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index 4df72e4..80eda28 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -104,8 +104,9 @@
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
 
     <application android:label="Car service"
-            android:allowBackup="false"
-	    android:persistent="true">
+                 android:allowBackup="false"
+                 android:persistent="true"
+                 android:process="android.car.service">
 
         <service android:name=".CarService"
                 android:singleUser="true">

service/src/com/android/car/cluster/InstrumentClusterService.java

diff --git a/service/src/com/android/car/cluster/InstrumentClusterService.java b/service/src/com/android/car/cluster/InstrumentClusterService.java
index 47f39fd..a6bd7f9 100644
--- a/service/src/com/android/car/cluster/InstrumentClusterService.java
+++ b/service/src/com/android/car/cluster/InstrumentClusterService.java
@@ -54,7 +54,9 @@
 
         if (rendererFound) {
             mRenderer = InstrumentClusterRendererLoader.createRenderer(mContext);
-            mRenderer.onCreate(mContext);
+            Context packageContext = InstrumentClusterRendererLoader
+                    .createRendererPackageContext(mContext);
+            mRenderer.onCreate(packageContext);
             mRenderer.initialize();
             mRenderer.onStart();
         }