From bb35eca0884d71ba863044f2bb71623e83a419cc Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Wed, 10 Jun 2015 17:02:39 -0700
Subject: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b

Conflicts:
	core/res/AndroidManifest.xml
---
 core/res/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b434294..319550b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1025,6 +1025,11 @@
         android:description="@string/permdesc_use_sip"
         android:label="@string/permlab_use_sip" />
 
+    <!-- Allows an application to receive STK related commands.
+         @hide -->
+    <permission android:name="android.permission.RECEIVE_STK_COMMANDS"
+        android:protectionLevel="system|signature" />
+
     <!-- ================================== -->
     <!-- Permissions for sdcard interaction -->
     <!-- ================================== -->
-- 
cgit v1.1