Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f411f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moves A11yServiceInfo size check in the system_server."

parents 834fa983 9ba4f769

core/java/android/accessibilityservice/AccessibilityService.java

+0 −4
Original line number Diff line number Diff line
@@ -2580,10 +2580,6 @@ public abstract class AccessibilityService extends Service { 
        IAccessibilityServiceConnection connection =

                AccessibilityInteractionClient.getInstance(this).getConnection(mConnectionId);

        if (mInfo != null && connection != null) {

            if (!mInfo.isWithinParcelableSize()) {

                throw new IllegalStateException(

                        "Cannot update service info: size is larger than safe parcelable limits.");

            }

            try {

                connection.setServiceInfo(mInfo);

                mInfo = null;

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+4 −0
Original line number Diff line number Diff line
@@ -478,6 +478,10 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
        if (svcConnTracingEnabled()) {

            logTraceSvcConn("setServiceInfo", "info=" + info);

        }

        if (!info.isWithinParcelableSize()) {

            throw new IllegalStateException(

                    "Cannot update service info: size is larger than safe parcelable limits.");

        }

        final long identity = Binder.clearCallingIdentity();

        try {

            synchronized (mLock) {