diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 82c7635fa5e32..c1e21959a6672 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -550,11 +550,6 @@ public class AccessibilityServiceInfo implements Parcelable { */ private int mHtmlDescriptionRes; - /** - * Non localized html description of the accessibility service. - */ - private String mNonLocalizedHtmlDescription; - /** * Creates a new instance. */ @@ -683,10 +678,6 @@ public class AccessibilityServiceInfo implements Parcelable { com.android.internal.R.styleable.AccessibilityService_htmlDescription); if (peekedValue != null) { mHtmlDescriptionRes = peekedValue.resourceId; - final CharSequence nonLocalizedHtmlDescription = peekedValue.coerceToString(); - if (nonLocalizedHtmlDescription != null) { - mNonLocalizedHtmlDescription = nonLocalizedHtmlDescription.toString().trim(); - } } asAttributes.recycle(); } catch (NameNotFoundException e) { @@ -919,7 +910,7 @@ public class AccessibilityServiceInfo implements Parcelable { @Nullable public String loadHtmlDescription(@NonNull PackageManager packageManager) { if (mHtmlDescriptionRes == 0) { - return mNonLocalizedHtmlDescription; + return null; } final ServiceInfo serviceInfo = mResolveInfo.serviceInfo; @@ -1017,7 +1008,6 @@ public class AccessibilityServiceInfo implements Parcelable { parcel.writeInt(mAnimatedImageRes); parcel.writeInt(mHtmlDescriptionRes); parcel.writeString(mNonLocalizedDescription); - parcel.writeString(mNonLocalizedHtmlDescription); } private void initFromParcel(Parcel parcel) { @@ -1039,7 +1029,6 @@ public class AccessibilityServiceInfo implements Parcelable { mAnimatedImageRes = parcel.readInt(); mHtmlDescriptionRes = parcel.readInt(); mNonLocalizedDescription = parcel.readString(); - mNonLocalizedHtmlDescription = parcel.readString(); } @Override diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 7d8b8db9d4a00..7fc041c8dbd47 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3774,7 +3774,7 @@ - + @@ -3795,7 +3795,7 @@ - +