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

Commit 9522ef33 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4586293, 4586294, 4586295, 4584365, 4584366, 4584367,... 

Merge cherrypicks of [4586293, 4586294, 4586295, 4584365, 4584366, 4584367, 4584368, 4584369, 4584370, 4587544, 4584705, 4586296, 4587545, 4587546, 4586297, 4586298, 4586299, 4586300, 4584371, 4586301, 4584706, 4586302, 4586303, 4587584, 4587585, 4587586, 4587587, 4587588, 4587589, 4587590, 4587591, 4587644, 4587645, 4587646, 4587647, 4587648, 4587649, 4587650, 4587651, 4587652, 4587653, 4587654, 4587655, 4587656, 4587657, 4587658, 4587659, 4587660, 4587661, 4587662, 4584536, 4587547, 4587548, 4587549, 4584707, 4584708, 4587550, 4587551, 4587593, 4586516, 4584372, 4584373, 4584374, 4587595, 4584375, 4584376, 4587552, 4587596, 4587597, 4587598, 4587599, 4584414, 4584415, 4584416, 4584417, 4584418, 4584419, 4584420, 4584421, 4584422, 4584423, 4587804, 4587805, 4587806, 4587807, 4587808, 4587809e, 4587810b, 4587811, 4587812, 4587813, 4587814, 4587815, 4587816, 4587817, 4587818, 4587884, 4587885, 4587600, 4587601, 4587819, 4584709] into sparse-4749909-L91900000192339903

Change-Id: I05ab6ec1384517154dff3078335d3c787a523f3d
parents 1477a4f6 3c0f405f

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/app/Activity.java

+10 −0
Original line number Diff line number Diff line
@@ -5871,6 +5871,16 @@ public class Activity extends ContextThemeWrapper 
        return mComponent;

    }



    /**

     * Temporary method on O-MR1 only.

     *

     * @hide

     */

    @Override

    public ComponentName getComponentNameForAutofill() {

        return mComponent;

    }



    /**

     * Retrieve a {@link SharedPreferences} object for accessing preferences

     * that are private to this activity.  This simply calls the underlying

core/java/android/app/ActivityManagerInternal.java

+5 −0
Original line number Diff line number Diff line
@@ -268,4 +268,9 @@ public abstract class ActivityManagerInternal { 
     * @param token The IApplicationToken for the activity

     */

    public abstract void setFocusedActivity(IBinder token);



    /**

     * Returns {@code true} if {@code uid} is running an activity from {@code packageName}.

     */

    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);

}

core/java/android/app/assist/AssistStructure.java

+10 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,16 @@ public class AssistStructure implements Parcelable { 
        return mActivityComponent;

    }



    /**

     * Called by Autofill server when app forged a different value.

     *

     * @hide

     */

    public void setActivityComponent(ComponentName componentName) {

        ensureData();

        mActivityComponent = componentName;

    }



    /** @hide */

    public int getFlags() {

        return mFlags;

core/java/android/appwidget/AppWidgetManagerInternal.java

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

 * Copyright (C) 2018 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.Nullable;

import android.util.ArraySet;



/**

 * 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);

}