Merge lp:~zhangew401/usensord/fix-lp-1628042 into lp:usensord

[Zhang Enwei]

fix lp:1628042, add telephony-service-approver and telephony-service-indicator as privileged caller to usensord

[Pat McGowan (pat-mcgowan)]

Looks good, the code makes sense and the new package in ticket 2014 works per the test plan

review: Approve

[Tiago Salem Herrmann (tiagosh)]

looks good.
I am no expert in usensord, but adding telephony-service-* as privileged processes looks correct to me.
Thanks Enwei!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-09 15:28:10 +0000
+++ debian/changelog	2016-09-28 04:44:47 +0000
@@ -1,3 +1,11 @@
+usensord (1.1+16.10.20160928-0ubuntu2) vivid; urgency=medium
+
+  * Fix lp:1628042.
+    Add telephony-service-approver and telephony-service-indicator
+    as privileged caller to usensord.
+
+ -- Zhang Enwei <[e-mail]>  Wed, 28 Sep 2016 12:24:27 +0800
+
 usensord (1.1+16.10.20160909-0ubuntu1) yakkety; urgency=medium
 
   [ enwei ]
 
=== modified file 'haptic/haptic.go'
--- haptic/haptic.go	2016-09-09 15:26:00 +0000
+++ haptic/haptic.go	2016-09-28 04:44:47 +0000
@@ -72,6 +72,8 @@
 	HAPTIC_DEVICE     = "/sys/class/timed_output/vibrator/enable"
         PROP_DBUS_IFACE = "org.freedesktop.DBus.Properties"
         OSK_PROCESS_NAME = "/usr/bin/maliit-server"
+        TSA_PROCESS_NAME = "/usr/bin/telephony-service-approver"
+        TSI_PROCESS_NAME = "/usr/bin/telephony-service-indicator"
         UNCONFINED_PROFILE = "unconfined"
 )
 
@@ -167,7 +169,7 @@
                 logger.Println("aa_is_enabled failed:", error)
                 profile = UNCONFINED_PROFILE
         }
-        isOSK := false
+        isPrivileged := false
         if profile == UNCONFINED_PROFILE {
                 file := "/proc/" + strconv.FormatUint(uint64(pid), 10) + "/exe"
                 _, err := os.Lstat(file)
@@ -179,13 +181,12 @@
                         logger.Printf("fail to read %s with error:", file, erreadexe.Error())
                 } else {
                         pname := strings.TrimSpace(string(exe))
-                        if pname == OSK_PROCESS_NAME  {
-                                isOSK = true
+                        if pname == OSK_PROCESS_NAME || pname == TSA_PROCESS_NAME || pname == TSI_PROCESS_NAME {
+                                isPrivileged = true
                         }
                 }
         }
-        if !isOSK && pvalue == 0 {
-                logger.Println("not vibrate since not osk and pvalue is 0")
+        if !isPrivileged && pvalue == 0 {
                 reply = dbus.NewMethodReturnMessage(msg)
                 return reply
         }