From fff9f7ed6154a209beefcbc40d8faf68c68f711c Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Thu, 31 Aug 2017 14:26:06 -0700
Subject: [PATCH] Removed deprecated BIND_AUTOFILL permission.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 37563972

Change-Id: If751eb94336756da205908deae9e3b9b1c67c4e8
---
 .../android/service/autofill/AutofillServiceInfo.java    | 9 ++++-----
 core/res/AndroidManifest.xml                             | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/java/android/service/autofill/AutofillServiceInfo.java b/core/java/android/service/autofill/AutofillServiceInfo.java
index e64eb0d629922..f14740066c95e 100644
--- a/core/java/android/service/autofill/AutofillServiceInfo.java
+++ b/core/java/android/service/autofill/AutofillServiceInfo.java
@@ -29,11 +29,12 @@ import android.os.RemoteException;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 import com.android.internal.R;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
 /**
@@ -89,9 +90,7 @@ public final class AutofillServiceInfo {
     @Nullable
     private static TypedArray getMetaDataArray(PackageManager pm, ServiceInfo si) {
         // Check for permissions.
-        // TODO(b/37563972): remove support to BIND_AUTOFILL once clients use BIND_AUTOFILL_SERVICE
-        if (!Manifest.permission.BIND_AUTOFILL_SERVICE.equals(si.permission)
-                && !Manifest.permission.BIND_AUTOFILL.equals(si.permission)) {
+        if (!Manifest.permission.BIND_AUTOFILL_SERVICE.equals(si.permission)) {
             Log.w(TAG, "AutofillService from '" + si.packageName + "' does not require permission "
                     + Manifest.permission.BIND_AUTOFILL_SERVICE);
             throw new SecurityException("Service does not require permission "
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 4f435af38c967..0d9a9959f1cf1 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2635,10 +2635,6 @@
     <permission android:name="android.permission.BIND_AUTOFILL_SERVICE"
         android:protectionLevel="signature" />
 
-    <!-- @hide TODO(b/37563972): remove once clients use BIND_AUTOFILL_SERVICE -->
-    <permission android:name="android.permission.BIND_AUTOFILL"
-        android:protectionLevel="signature" />
-
     <!-- Must be required by hotword enrollment application,
          to ensure that only the system can interact with it.
          @hide <p>Not for use by third-party applications.</p> -->