Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reformat two Kotlin files I mistakenly formatted with IntelliJ" into tm-qpr-dev

Browse Source
This commit is contained in:
Justin Weir
2022-10-19 12:49:48 +00:00
committed by Android (Google) Code Review
parent f22ddb2916 9839190a6f
commit fccadc85cd
2 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt
View File

@@ -12,64 +12,69 @@ private const val TAG = "systemui.shade"
/** Lightweight logging utility for the Shade. */ /** Lightweight logging utility for the Shade. */
class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) { class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
fun v(@CompileTimeConstant msg: String) { fun v(@CompileTimeConstant msg: String) {
buffer.log(TAG, LogLevel.VERBOSE, msg) buffer.log(TAG, LogLevel.VERBOSE, msg)
} }
private inline fun log( private inline fun log(
logLevel: LogLevel, logLevel: LogLevel,
initializer: LogMessage.() -> Unit, initializer: LogMessage.() -> Unit,
noinline printer: LogMessage.() -> String noinline printer: LogMessage.() -> String
) { ) {
buffer.log(TAG, logLevel, initializer, printer) buffer.log(TAG, logLevel, initializer, printer)
} }
fun onQsInterceptMoveQsTrackingEnabled(h: Float) { fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
log( log(
LogLevel.VERBOSE, LogLevel.VERBOSE,
{ double1 = h.toDouble() }, { double1 = h.toDouble() },
{ "onQsIntercept: move action, QS tracking enabled. h = $double1" }) { "onQsIntercept: move action, QS tracking enabled. h = $double1" }
} )
}
fun logQsTrackingNotStarted( fun logQsTrackingNotStarted(
initialTouchY: Float, initialTouchY: Float,
y: Float, y: Float,
h: Float, h: Float,
touchSlop: Float, touchSlop: Float,
qsExpanded: Boolean, qsExpanded: Boolean,
collapsedOnDown: Boolean, collapsedOnDown: Boolean,
keyguardShowing: Boolean, keyguardShowing: Boolean,
qsExpansionEnabled: Boolean qsExpansionEnabled: Boolean
) { ) {
log( log(
LogLevel.VERBOSE, LogLevel.VERBOSE,
{ {
int1 = initialTouchY.toInt() int1 = initialTouchY.toInt()
int2 = y.toInt() int2 = y.toInt()
long1 = h.toLong() long1 = h.toLong()
double1 = touchSlop.toDouble() double1 = touchSlop.toDouble()
bool1 = qsExpanded bool1 = qsExpanded
bool2 = collapsedOnDown bool2 = collapsedOnDown
bool3 = keyguardShowing bool3 = keyguardShowing
bool4 = qsExpansionEnabled bool4 = qsExpansionEnabled
}, },
{ {
"QsTrackingNotStarted: initTouchY=$int1,y=$int2,h=$long1,slop=$double1,qsExpanded=" + "QsTrackingNotStarted: initTouchY=$int1,y=$int2,h=$long1,slop=$double1,qsExpanded" +
"$bool1,collapsedDown=$bool2,keyguardShowing=$bool3,qsExpansion=$bool4" "=$bool1,collapsedDown=$bool2,keyguardShowing=$bool3,qsExpansion=$bool4"
}) }
} )
}
fun logMotionEvent(event: MotionEvent, message: String) { fun logMotionEvent(event: MotionEvent, message: String) {
log( log(
LogLevel.VERBOSE, LogLevel.VERBOSE,
{ {
str1 = message str1 = message
long1 = event.eventTime long1 = event.eventTime
long2 = event.downTime long2 = event.downTime
int1 = event.action int1 = event.action
int2 = event.classification int2 = event.classification
double1 = event.y.toDouble() double1 = event.y.toDouble()
}, },
{ "$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,classification=$int2" }) {
} "$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,class=$int2"
}
)
}
} }

100
packages/SystemUI/tests/src/com/android/systemui/shared/system/UncaughtExceptionPreHandlerTest.kt
View File

@@ -17,58 +17,58 @@ import org.mockito.MockitoAnnotations
@SmallTest @SmallTest
class UncaughtExceptionPreHandlerTest : SysuiTestCase() { class UncaughtExceptionPreHandlerTest : SysuiTestCase() {
private lateinit var preHandlerManager: UncaughtExceptionPreHandlerManager private lateinit var preHandlerManager: UncaughtExceptionPreHandlerManager
@Mock private lateinit var mockHandler: UncaughtExceptionHandler @Mock private lateinit var mockHandler: UncaughtExceptionHandler
@Mock private lateinit var mockHandler2: UncaughtExceptionHandler @Mock private lateinit var mockHandler2: UncaughtExceptionHandler
@Before @Before
fun setUp() { fun setUp() {
MockitoAnnotations.initMocks(this) MockitoAnnotations.initMocks(this)
Thread.setUncaughtExceptionPreHandler(null) Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager = UncaughtExceptionPreHandlerManager() preHandlerManager = UncaughtExceptionPreHandlerManager()
} }
@Test @Test
fun registerHandler_registersOnceOnly() { fun registerHandler_registersOnceOnly() {
preHandlerManager.registerHandler(mockHandler) preHandlerManager.registerHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler) preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception()) preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any()) verify(mockHandler, only()).uncaughtException(any(), any())
} }
@Test @Test
fun registerHandler_setsUncaughtExceptionPreHandler() { fun registerHandler_setsUncaughtExceptionPreHandler() {
Thread.setUncaughtExceptionPreHandler(null) Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager.registerHandler(mockHandler) preHandlerManager.registerHandler(mockHandler)
assertThat(Thread.getUncaughtExceptionPreHandler()).isNotNull() assertThat(Thread.getUncaughtExceptionPreHandler()).isNotNull()
} }
@Test @Test
fun registerHandler_preservesOriginalHandler() { fun registerHandler_preservesOriginalHandler() {
Thread.setUncaughtExceptionPreHandler(mockHandler) Thread.setUncaughtExceptionPreHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler2) preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception()) preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any()) verify(mockHandler, only()).uncaughtException(any(), any())
} }
@Test @Test
@Ignore @Ignore
fun registerHandler_toleratesHandlersThatThrow() { fun registerHandler_toleratesHandlersThatThrow() {
`when`(mockHandler2.uncaughtException(any(), any())).thenThrow(RuntimeException()) `when`(mockHandler2.uncaughtException(any(), any())).thenThrow(RuntimeException())
preHandlerManager.registerHandler(mockHandler2) preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.registerHandler(mockHandler) preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception()) preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler2, only()).uncaughtException(any(), any()) verify(mockHandler2, only()).uncaughtException(any(), any())
verify(mockHandler, only()).uncaughtException(any(), any()) verify(mockHandler, only()).uncaughtException(any(), any())
} }
@Test @Test
fun registerHandler_doesNotSetUpTwice() { fun registerHandler_doesNotSetUpTwice() {
UncaughtExceptionPreHandlerManager().registerHandler(mockHandler2) UncaughtExceptionPreHandlerManager().registerHandler(mockHandler2)
assertThrows(IllegalStateException::class.java) { assertThrows(IllegalStateException::class.java) {
preHandlerManager.registerHandler(mockHandler) preHandlerManager.registerHandler(mockHandler)
}
} }
}
} }