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

Commit 3c2c834a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081,... 

Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, 4743082, 4743083, 4741262, 4741263, 4741264, 4741265, 4741266, 4741667, 4743084, 4741242, 4741243, 4741741, 4741742, 4741743, 4741744, 4741822, 4743085, 4741668, 4741338, 4743055, 4743056, 4743070, 4743073, 4743075, 4743076, 4743078, 4743079, 4743161, 4743162, 4743164, 4743165, 4743167, 4743168, 4743169, 4743170, 4741681, 4741682, 4741683, 4741684, 4741685, 4741686, 4741687, 4741688, 4741689, 4741690, 4741691, 4741692, 4741693, 4741694, 4741695, 4741696, 4741697, 4741698, 4741699, 4743240, 4743241, 4743242, 4743243, 4741745, 4741823, 4741824, 4741825, 4741267, 4741268, 4743244, 4743280, 4743281, 4743224, 4743203, 4743204, 4743205, 4741746, 4741747, 4743245, 4741826, 4741827, 4741828, 4741829, 4741748, 4741749, 4741750, 4743233, 4743282, 4741244, 4741245, 4741246, 4741247, 4743206, 4743207, 4743208, 4743209, 4743210, 4743211, 4743212, 4743213, 4743214, 4743215, 4743216, 4743217, 4743218, 4743219, 4743360, 4743361, 4743362, 4743363, 4743364, 4743365, 4743366, 4743367, 4743368, 4743369, 4743370, 4743371, 4743372, 4743373, 4743374, 4743375, 4743376, 4743377, 4743283, 4743284, 4741830, 4742501, 4743246, 4743086, 4743087, 4743378, 4743379, 4741751] into sparse-4749909-L04200000199131547

Change-Id: I1492186998ee5230a67cd2efaf8c68d8b008cb7e
parents 1477a4f6 f28568c9

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

}