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

Commit 02f0c205 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Frameworks: Let GuardedBy accept multiple locks" am: 940a9e95 am: b32933c3

am: a48b21a8

Change-Id: I59fd2f34f26a036387e909b6ad9f6c78b6bdc897
parents 44b03518 a48b21a8
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import java.lang.annotation.Target;

/**
 * Annotation type used to mark a method or field that can only be accessed when
 * holding the referenced lock.
 * holding the referenced locks.
 */
@Target({ ElementType.FIELD, ElementType.METHOD })
@Retention(RetentionPolicy.CLASS)
public @interface GuardedBy {
    String value();
    String[] value();
}