From 974e56f141c31c596f89d2ed1725416245962a68 Mon Sep 17 00:00:00 2001
From: Yi Jin <jinyithu@google.com>
Date: Mon, 22 Jan 2018 10:48:04 -0800
Subject: Enable incidentd.rc also add dump and usage_stats permission to
 statsd so it bypass incidentd's permission check

Test: manual
Change-Id: I65b501fe46f66f9f62fedfcfc75aa17f29fc1076
---
 cmds/incidentd/Android.mk | 2 --
 data/etc/platform.xml     | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmds/incidentd/Android.mk b/cmds/incidentd/Android.mk
index 368a70bc3898..2b00d9e6a596 100644
--- a/cmds/incidentd/Android.mk
+++ b/cmds/incidentd/Android.mk
@@ -91,9 +91,7 @@ GEN_PROTO:=
 
 gen_src_dir:=
 
-ifeq ($(BUILD_WITH_INCIDENTD_RC), true)
 LOCAL_INIT_RC := incidentd.rc
-endif
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 4be6408dca16..09192f4fa72f 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -172,6 +172,8 @@
     <assign-permission name="android.permission.ACCESS_LOWPAN_STATE" uid="lowpan" />
     <assign-permission name="android.permission.MANAGE_LOWPAN_INTERFACES" uid="lowpan" />
 
+    <assign-permission name="android.permission.DUMP" uid="statsd" />
+    <assign-permission name="android.permission.PACKAGE_USAGE_STATS" uid="statsd" />
     <assign-permission name="android.permission.STATSCOMPANION" uid="statsd" />
 
     <!-- This is a list of all the libraries available for application
-- 
cgit v1.2.3-59-g8ed1b