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

Commit 192433cb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4314166, 4314167, 4314168, 4314169, 4314462, 4314463,... 

Merge cherrypicks of [4314166, 4314167, 4314168, 4314169, 4314462, 4314463, 4314464, 4314465, 4314466, 4314643, 4314644, 4314185, 4314467, 4314468, 4315341, 4315342, 4315343, 4315344, 4315345, 4314469, 4314283, 4314186, 4314187, 4314188, 4314189, 4314190, 4314191, 4314192, 4315082, 4315083, 4315084, 4315085, 4315086, 4315087, 4315088, 4315089, 4315090, 4315091, 4315092, 4314170, 4314284, 4314285, 4314286, 4314287, 4314171, 4314172, 4315346, 4314288, 4315381, 4315401, 4315402, 4314289, 4314290, 4314291, 4314292, 4314293, 4314294, 4314295, 4314296, 4314297, 4314298, 4314299, 4314300, 4315421, 4315422, 4314034, 4314229, 4315347, 4315423, 4315424, 4315314, 4315348, 4315349, 4314470, 4315425, 4315426, 4315427, 4315428, 4315429] into sparse-4732990-L02900000181396755

Change-Id: I63bfde261a157bb1c274cb65f11df95a5a9d8534
parents 4302e839 fa2b0a38

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

}

core/java/android/bluetooth/BluetoothDevice.java

+5 −1
Original line number Diff line number Diff line
@@ -808,7 +808,11 @@ public final class BluetoothDevice implements Parcelable { 
            return null;

        }

        try {

            return service.getRemoteName(this);

            String name = service.getRemoteName(this);

            if (name != null) {

                return name.replaceAll("[\\t\\n\\r]+", " ");

            }

            return null;

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

core/java/android/os/Parcel.java

+8 −7
Original line number Diff line number Diff line
@@ -1340,6 +1340,13 @@ public final class Parcel { 
     * @see Parcelable

     */

    public final <T extends Parcelable> void writeTypedList(List<T> val) {

        writeTypedList(val, 0);

    }



    /**

     * @hide

     */

    public <T extends Parcelable> void writeTypedList(List<T> val, int parcelableFlags) {

        if (val == null) {

            writeInt(-1);

            return;
@@ -1348,13 +1355,7 @@ public final class Parcel { 
        int i=0;

        writeInt(N);

        while (i < N) {

            T item = val.get(i);

            if (item != null) {

                writeInt(1);

                item.writeToParcel(this, 0);

            } else {

                writeInt(0);

            }

            writeTypedObject(val.get(i), parcelableFlags);

            i++;

        }

    }