From 42b4c4c057dfd9dca58dbba7359d0da839a708fa Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Sat, 12 Aug 2017 01:09:41 +0100
Subject: [PATCH] Move DISABLE_INPUT_DEVICE permission

Move DISABLE_INPUT_DEVICE permission out of the
reserved android namespace until the next API
version. It appears to be mostly unused.

Fixes: 64615722
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: If77fd9e5c0eede418fa14a37e5e895fee5667576
Merged-In: Ic98af7e3953da63c3c49bfd38d8cfd0ff0646869
---
 core/res/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index fb14c64366e7b..9bca62d8c3571 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2773,7 +2773,7 @@
          Could be used to prevent unwanted touch events
          on a touchscreen, for example during swimming or rain.
          @hide -->
-    <permission android:name="android.permission.DISABLE_INPUT_DEVICE"
+    <permission android:name="com.android.permission.DISABLE_INPUT_DEVICE"
         android:protectionLevel="signature" />
 
     <!-- Allows an application to configure and connect to Wifi displays