commit 416400511a5fd272285e9de1072795e1c7431715
author Peter Li <pyli@google.com> Wed Jan 23 02:06:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 23 02:06:22 2019 +0000
tree 700a524bc6bbee8b28a2889cc66f61b82d25433e
parent fae614ca514934a6edb5464da6836a923ffd302c
parent 6c55292453778bf63c83c7a012ad300cf9aec022

Merge "Fixes Instrument cluster permissions - upgraded privileges to system user"

tests/DirectRenderingClusterSample/AndroidManifest.xml

diff --git a/tests/DirectRenderingClusterSample/AndroidManifest.xml b/tests/DirectRenderingClusterSample/AndroidManifest.xml
index 2dcdc58..12c6bba 100644
--- a/tests/DirectRenderingClusterSample/AndroidManifest.xml
+++ b/tests/DirectRenderingClusterSample/AndroidManifest.xml
@@ -16,8 +16,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="android.car.cluster.sample"
-      android:versionCode="1"
-      android:versionName="1.0">
+    android:sharedUserId="android.uid.system">
 
     <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="25"/>
 

tests/DirectRenderingClusterSample/src/android/car/cluster/sample/MainClusterActivity.java

diff --git a/tests/DirectRenderingClusterSample/src/android/car/cluster/sample/MainClusterActivity.java b/tests/DirectRenderingClusterSample/src/android/car/cluster/sample/MainClusterActivity.java
index 3e123e4..c8bff38 100644
--- a/tests/DirectRenderingClusterSample/src/android/car/cluster/sample/MainClusterActivity.java
+++ b/tests/DirectRenderingClusterSample/src/android/car/cluster/sample/MainClusterActivity.java
@@ -247,7 +247,7 @@
 
         Intent intent = new Intent(this, ClusterRenderingServiceImpl.class);
         intent.setAction(LOCAL_BINDING_ACTION);
-        bindService(intent, mClusterRenderingServiceConnection, 0);
+        bindServiceAsUser(intent, mClusterRenderingServiceConnection, 0, UserHandle.SYSTEM);
 
         registerFacet(new Facet<>(findViewById(R.id.btn_nav), 0, NavigationFragment.class));
         registerFacet(new Facet<>(findViewById(R.id.btn_phone), 1, PhoneFragment.class));