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

Commit 240aed98 authored by Svet Ganov's avatar Svet Ganov
Browse files

Prevent reporting fake package name - framework 

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

bug:69981755

Change-Id: I13304efbee10d1affa087e9c8bc4ec237643283e
parent f9b2ef59

core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl

+5 −5
Original line number Diff line number Diff line
@@ -35,23 +35,23 @@ interface IAccessibilityServiceConnection { 


    void setServiceInfo(in AccessibilityServiceInfo info);



    boolean findAccessibilityNodeInfoByAccessibilityId(int accessibilityWindowId,

    String[] findAccessibilityNodeInfoByAccessibilityId(int accessibilityWindowId,

        long accessibilityNodeId, int interactionId,

        IAccessibilityInteractionConnectionCallback callback, int flags, long threadId,

        in Bundle arguments);



    boolean findAccessibilityNodeInfosByText(int accessibilityWindowId, long accessibilityNodeId,

    String[] findAccessibilityNodeInfosByText(int accessibilityWindowId, long accessibilityNodeId,

        String text, int interactionId, IAccessibilityInteractionConnectionCallback callback,

        long threadId);



    boolean findAccessibilityNodeInfosByViewId(int accessibilityWindowId,

    String[] findAccessibilityNodeInfosByViewId(int accessibilityWindowId,

        long accessibilityNodeId, String viewId, int interactionId,

        IAccessibilityInteractionConnectionCallback callback, long threadId);



    boolean findFocus(int accessibilityWindowId, long accessibilityNodeId, int focusType,

    String[] findFocus(int accessibilityWindowId, long accessibilityNodeId, int focusType,

        int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId);



    boolean focusSearch(int accessibilityWindowId, long accessibilityNodeId, int direction,

    String[] focusSearch(int accessibilityWindowId, long accessibilityNodeId, int direction,

        int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId);



    boolean performAccessibilityAction(int accessibilityWindowId, long accessibilityNodeId,

core/java/android/appwidget/AppWidgetManagerInternal.java

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.appwidget;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.util.ArraySet;



import java.util.Set;



/**

 * App widget manager local system service interface.

 *

 * @hide Only for use within the system server.

 */

public abstract class AppWidgetManagerInternal {



    /**

     * Gets the packages from which the uid hosts widgets.

     *

     * @param uid The potential host UID.

     * @return Whether the UID hosts widgets from the package.

     */

    public abstract @Nullable ArraySet<String> getHostedWidgetPackages(int uid);

}

core/java/android/view/ViewRootImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -7877,6 +7877,7 @@ public final class ViewRootImpl implements ViewParent, 
            if (!registered) {

                mAttachInfo.mAccessibilityWindowId =

                        mAccessibilityManager.addAccessibilityInteractionConnection(mWindow,

                                mContext.getPackageName(),

                                new AccessibilityInteractionConnection(ViewRootImpl.this));

            }

        }

core/java/android/view/accessibility/AccessibilityInteractionClient.java

+45 −31
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.util.LongSparseArray; 
import android.util.SparseArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;



import java.util.ArrayList;

import java.util.Collections;
@@ -213,7 +214,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @return The {@link AccessibilityWindowInfo}.

     */
@@ -299,7 +300,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -335,18 +336,19 @@ public final class AccessibilityInteractionClient 
                }

                final int interactionId = mInteractionIdCounter.getAndIncrement();

                final long identityToken = Binder.clearCallingIdentity();

                final boolean success;

                final String[] packageNames;

                try {

                    success = connection.findAccessibilityNodeInfoByAccessibilityId(

                    packageNames = connection.findAccessibilityNodeInfoByAccessibilityId(

                            accessibilityWindowId, accessibilityNodeId, interactionId, this,

                            prefetchFlags, Thread.currentThread().getId(), arguments);

                } finally {

                    Binder.restoreCallingIdentity(identityToken);

                }

                if (success) {

                if (packageNames != null) {

                    List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(

                            interactionId);

                    finalizeAndCacheAccessibilityNodeInfos(infos, connectionId, bypassCache);

                    finalizeAndCacheAccessibilityNodeInfos(infos, connectionId,

                            bypassCache, packageNames);

                    if (infos != null && !infos.isEmpty()) {

                        for (int i = 1; i < infos.size(); i++) {

                            infos.get(i).recycle();
@@ -373,7 +375,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -389,20 +391,21 @@ public final class AccessibilityInteractionClient 
            if (connection != null) {

                final int interactionId = mInteractionIdCounter.getAndIncrement();

                final long identityToken = Binder.clearCallingIdentity();

                final boolean success;

                final String[] packageNames;

                try {

                    success = connection.findAccessibilityNodeInfosByViewId(

                    packageNames = connection.findAccessibilityNodeInfosByViewId(

                            accessibilityWindowId, accessibilityNodeId, viewId, interactionId, this,

                            Thread.currentThread().getId());

                } finally {

                    Binder.restoreCallingIdentity(identityToken);

                }



                if (success) {

                if (packageNames != null) {

                    List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(

                            interactionId);

                    if (infos != null) {

                        finalizeAndCacheAccessibilityNodeInfos(infos, connectionId, false);

                        finalizeAndCacheAccessibilityNodeInfos(infos, connectionId,

                                false, packageNames);

                        return infos;

                    }

                }
@@ -426,7 +429,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -442,20 +445,21 @@ public final class AccessibilityInteractionClient 
            if (connection != null) {

                final int interactionId = mInteractionIdCounter.getAndIncrement();

                final long identityToken = Binder.clearCallingIdentity();

                final boolean success;

                final String[] packageNames;

                try {

                    success = connection.findAccessibilityNodeInfosByText(

                    packageNames = connection.findAccessibilityNodeInfosByText(

                            accessibilityWindowId, accessibilityNodeId, text, interactionId, this,

                            Thread.currentThread().getId());

                } finally {

                    Binder.restoreCallingIdentity(identityToken);

                }



                if (success) {

                if (packageNames != null) {

                    List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(

                            interactionId);

                    if (infos != null) {

                        finalizeAndCacheAccessibilityNodeInfos(infos, connectionId, false);

                        finalizeAndCacheAccessibilityNodeInfos(infos, connectionId,

                                false, packageNames);

                        return infos;

                    }

                }
@@ -478,7 +482,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -494,19 +498,19 @@ public final class AccessibilityInteractionClient 
            if (connection != null) {

                final int interactionId = mInteractionIdCounter.getAndIncrement();

                final long identityToken = Binder.clearCallingIdentity();

                final boolean success;

                final String[] packageNames;

                try {

                    success = connection.findFocus(accessibilityWindowId,

                    packageNames = connection.findFocus(accessibilityWindowId,

                            accessibilityNodeId, focusType, interactionId, this,

                            Thread.currentThread().getId());

                } finally {

                    Binder.restoreCallingIdentity(identityToken);

                }



                if (success) {

                if (packageNames != null) {

                    AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(

                            interactionId);

                    finalizeAndCacheAccessibilityNodeInfo(info, connectionId, false);

                    finalizeAndCacheAccessibilityNodeInfo(info, connectionId, false, packageNames);

                    return info;

                }

            } else {
@@ -527,7 +531,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -543,19 +547,19 @@ public final class AccessibilityInteractionClient 
            if (connection != null) {

                final int interactionId = mInteractionIdCounter.getAndIncrement();

                final long identityToken = Binder.clearCallingIdentity();

                final boolean success;

                final String[] packageNames;

                try {

                    success = connection.focusSearch(accessibilityWindowId,

                    packageNames = connection.focusSearch(accessibilityWindowId,

                            accessibilityNodeId, direction, interactionId, this,

                            Thread.currentThread().getId());

                } finally {

                    Binder.restoreCallingIdentity(identityToken);

                }



                if (success) {

                if (packageNames != null) {

                    AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(

                            interactionId);

                    finalizeAndCacheAccessibilityNodeInfo(info, connectionId, false);

                    finalizeAndCacheAccessibilityNodeInfo(info, connectionId, false, packageNames);

                    return info;

                }

            } else {
@@ -574,7 +578,7 @@ public final class AccessibilityInteractionClient 
     *

     * @param connectionId The id of a connection for interacting with the system.

     * @param accessibilityWindowId A unique window id. Use

     *     {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID}

     *     {@link android.view.accessibility.AccessibilityWindowInfo#ACTIVE_WINDOW_ID}

     *     to query the currently active window.

     * @param accessibilityNodeId A unique view id or virtual descendant id from

     *     where to start the search. Use
@@ -661,7 +665,7 @@ public final class AccessibilityInteractionClient 
                int interactionId) {

        synchronized (mInstanceLock) {

            final boolean success = waitForResultTimedLocked(interactionId);

            List<AccessibilityNodeInfo> result = null;

            final List<AccessibilityNodeInfo> result;

            if (success) {

                result = mFindAccessibilityNodeInfosResult;

            } else {
@@ -779,11 +783,19 @@ public final class AccessibilityInteractionClient 
     * @param connectionId The id of the connection to the system.

     * @param bypassCache Whether or not to bypass the cache. The node is added to the cache if

     *                    this value is {@code false}

     * @param packageNames The valid package names a node can come from.

     */

    private void finalizeAndCacheAccessibilityNodeInfo(AccessibilityNodeInfo info,

            int connectionId, boolean bypassCache) {

            int connectionId, boolean bypassCache, String[] packageNames) {

        if (info != null) {

            info.setConnectionId(connectionId);

            // Empty array means any package name is Okay

            if (!ArrayUtils.isEmpty(packageNames)

                    && !ArrayUtils.contains(packageNames, info.getPackageName().toString())) {

                // If the node package not one of the valid ones, pick the top one - this

                // is one of the packages running in the introspected UID.

                info.setPackageName(packageNames[0]);

            }

            info.setSealed(true);

            if (!bypassCache) {

                sAccessibilityCache.add(info);
@@ -798,14 +810,16 @@ public final class AccessibilityInteractionClient 
     * @param connectionId The id of the connection to the system.

     * @param bypassCache Whether or not to bypass the cache. The nodes are added to the cache if

     *                    this value is {@code false}

     * @param packageNames The valid package names a node can come from.

     */

    private void finalizeAndCacheAccessibilityNodeInfos(List<AccessibilityNodeInfo> infos,

            int connectionId, boolean bypassCache) {

            int connectionId, boolean bypassCache, String[] packageNames) {

        if (infos != null) {

            final int infosCount = infos.size();

            for (int i = 0; i < infosCount; i++) {

                AccessibilityNodeInfo info = infos.get(i);

                finalizeAndCacheAccessibilityNodeInfo(info, connectionId, bypassCache);

                finalizeAndCacheAccessibilityNodeInfo(info, connectionId,

                        bypassCache, packageNames);

            }

        }

    }

core/java/android/view/accessibility/AccessibilityManager.java

+3 −2
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ public final class AccessibilityManager { 
     * @hide

     */

    public int addAccessibilityInteractionConnection(IWindow windowToken,

            IAccessibilityInteractionConnection connection) {

            String packageName, IAccessibilityInteractionConnection connection) {

        final IAccessibilityManager service;

        final int userId;

        synchronized (mLock) {
@@ -899,7 +899,8 @@ public final class AccessibilityManager { 
            userId = mUserId;

        }

        try {

            return service.addAccessibilityInteractionConnection(windowToken, connection, userId);

            return service.addAccessibilityInteractionConnection(windowToken, connection,

                    packageName, userId);

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "Error while adding an accessibility interaction connection. ", re);

        }