commit 56e16bb1ca516dd25fb91d44d70ed50c578ecb99
author Dan Stoza <stoza@google.com> Tue Aug 09 22:29:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 22:29:58 2016 +0000
tree 3befbc6179a08938345900ab64f83b2727ace306
parent cb69c31db8b15b179b2333b9c8bb7b5cc28e71d6
parent 92cd24e5f648175944deef5899258981807a9ca4

SF: Fix a couple of Layer ref count issues
am: 92cd24e5f6

Change-Id: Ia62ec102448136979df26ba907bfb1852d4d0373

cmds/servicemanager/service_manager.c

diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 21fdff0..8a8e688 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -121,6 +121,11 @@
 static int svc_can_register(const uint16_t *name, size_t name_len, pid_t spid, uid_t uid)
 {
     const char *perm = "add";
+
+    if (uid >= AID_APP) {
+        return 0; /* Don't allow apps to register services */
+    }
+
     return check_mac_perms_from_lookup(spid, uid, perm, str8(name, name_len)) ? 1 : 0;
 }
 

data/etc/wearable_core_hardware.xml

diff --git a/data/etc/wearable_core_hardware.xml b/data/etc/wearable_core_hardware.xml
index 4ff00b5..84230da 100644
--- a/data/etc/wearable_core_hardware.xml
+++ b/data/etc/wearable_core_hardware.xml
@@ -24,6 +24,7 @@
     <feature name="android.hardware.location" />
     <!-- devices supporting compass/magnitometer sensor must include
 	 android.hardware.sensor.compass.xml -->
+    <feature name="android.hardware.sensor.gyroscope" />
     <feature name="android.hardware.sensor.accelerometer" />
     <feature name="android.hardware.bluetooth" />
     <feature name="android.hardware.touchscreen" />