From befa79d7e009f7913d75772d3e646b8a69b19e79 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 6 Jun 2016 11:22:13 -0700
Subject: [PATCH] logcatd: Do not su for setprop

(cherry pick from commit 8d2a65572b5aa3d7d3885bd1b46d7c1f22e052b6)

sepolicy now permits setting persist.logd.logpersistd in shell

Bug: 28788401
Bug: 28813587
Bug: 28936216
Change-Id: Ieed50eae0f91afa5b0c0e4ade7a71922c4b7ef93
---
 logcat/logpersist | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/logcat/logpersist b/logcat/logpersist
index 923c5fbfc..a95f3d847 100755
--- a/logcat/logpersist
+++ b/logcat/logpersist
@@ -74,7 +74,7 @@ case ${progname} in
   if [ "${service}" = "`getprop ${property}`" ]; then
     if [ "true" = "${clear}" ]; then
       su root stop ${service}
-      su root setprop ${property} ""
+      setprop ${property} ""
       # 20ms done, guarantees content stop before rm
       sleep 1
     elif [ "${buffer}|${size}" != "${current_buffer}|${current_size}" ]; then
@@ -103,13 +103,13 @@ case ${progname} in
     su logd,misc rm -rf "${data}"
   fi
   if [ -n "${buffer}${current_buffer}" ]; then
-    su root setprop ${property}.buffer "${buffer}"
+    setprop ${property}.buffer "${buffer}"
   fi
   if [ -n "${size}${current_size}" ]; then
-    su root setprop ${property}.size "${size}"
+    setprop ${property}.size "${size}"
   fi
   # ${service}.rc does the heavy lifting with the following trigger
-  su root setprop ${property} ${service}
+  setprop ${property} ${service}
   getprop ${property}
   # 20ms done, to permit process feedback check
   sleep 1
@@ -121,12 +121,12 @@ case ${progname} in
     echo "WARNING: Can not use --size or --buffer with ${progname%.*}.stop" >&2
   fi
   su root stop ${service}
-  su root setprop ${property} ""
+  setprop ${property} ""
   if [ -n "`getprop ${property}.buffer`" ]; then
-    su root setprop ${property}.buffer ""
+    setprop ${property}.buffer ""
   fi
   if [ -n "`getprop ${property}.size`" ]; then
-    su root setprop ${property}.size ""
+    setprop ${property}.size ""
   fi
   if [ "true" = "${clear}" ]; then
     # 20ms done, guarantees content stop before rm