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

Commit b488b677 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemUI: Switch to Kotlin alternatives for java.lang annotations" into... 

Merge "SystemUI: Switch to Kotlin alternatives for java.lang annotations" into main am: bfe4eb46 am: ce342a8d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3204630



Change-Id: I1f9aaad17ce262910e8afcb496cbc43836879530
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0deea35c ce342a8d

packages/SystemUI/shared/src/com/android/systemui/dagger/qualifiers/DisplaySpecific.kt

+1 −4
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ 
 */

package com.android.systemui.dagger.qualifiers



import java.lang.annotation.Documented

import java.lang.annotation.Retention

import java.lang.annotation.RetentionPolicy.RUNTIME

import javax.inject.Qualifier



/** Annotates a class that is display specific. */

@Qualifier @Documented @Retention(RUNTIME) annotation class DisplaySpecific
 
@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class DisplaySpecific

packages/SystemUI/src/com/android/systemui/log/dagger/BouncerTableLog.kt

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package com.android.systemui.log.dagger



import java.lang.annotation.Documented

import java.lang.annotation.Retention

import java.lang.annotation.RetentionPolicy

import javax.inject.Qualifier



/** Logger for the primary and alternative bouncers. */

@Qualifier @Documented @Retention(RetentionPolicy.RUNTIME) annotation class BouncerTableLog
 
@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class BouncerTableLog

packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSTileListLog.kt

+1 −3
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
 */

package com.android.systemui.qs.pipeline.dagger



import java.lang.annotation.Retention

import java.lang.annotation.RetentionPolicy

import javax.inject.Qualifier



/** A [LogBuffer] for the new QS Pipeline for logging changes to the set of current tiles. */

@Qualifier @MustBeDocumented @Retention(RetentionPolicy.RUNTIME) annotation class QSTileListLog
 
@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class QSTileListLog