diff options
| author | 2017-09-01 15:11:56 +0000 | |
|---|---|---|
| committer | 2017-09-01 15:11:56 +0000 | |
| commit | 9eb7a69e785b490be00d87ffccd4c861507fca50 (patch) | |
| tree | 4844d83c9d2197d1b168c8d6477e1fedcc876f7c | |
| parent | b9f089b96fe914a0a2d2564c0099f3060c1f2d6a (diff) | |
| parent | fff9f7ed6154a209beefcbc40d8faf68c68f711c (diff) | |
Merge "Removed deprecated BIND_AUTOFILL permission."
| -rw-r--r-- | core/java/android/service/autofill/AutofillServiceInfo.java | 9 | ||||
| -rw-r--r-- | 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 e64eb0d62992..f14740066c95 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 4f435af38c96..0d9a9959f1cf 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> --> |