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

Commit 3aeb4c46 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Add intdef for UiAutomation flags." into nyc-dev 

am: 3b2e22a0

* commit '3b2e22a0':
  Add intdef for UiAutomation flags.
parents a97cb54f 3b2e22a0

core/java/android/app/Instrumentation.java

+13 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app;



import android.annotation.IntDef;

import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.Context;
@@ -49,6 +50,8 @@ import android.view.Window; 
import com.android.internal.content.ReferrerIntent;



import java.io.File;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;
@@ -79,6 +82,14 @@ public class Instrumentation { 


    private static final String TAG = "Instrumentation";



    /**

     * @hide

     */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef({0, UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES})

    public @interface UiAutomationFlags {};





    private final Object mSync = new Object();

    private ActivityThread mThread = null;

    private MessageQueue mMessageQueue = null;
@@ -1876,7 +1887,7 @@ public class Instrumentation { 
     *

     * @see UiAutomation

     */

    public UiAutomation getUiAutomation(int flags) {

    public UiAutomation getUiAutomation(@UiAutomationFlags int flags) {

        if (mUiAutomationConnection != null) {

            if ((mUiAutomation == null) || (mUiAutomation.isDestroyed())) {

                mUiAutomation = new UiAutomation(getTargetContext().getMainLooper(),