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. */
class ShadeLogger @Inject constructor(@ShadeLog private val buffer: LogBuffer) {
fun v(@CompileTimeConstant msg: String) {
buffer.log(TAG, LogLevel.VERBOSE, msg)
}
fun v(@CompileTimeConstant msg: String) {
buffer.log(TAG, LogLevel.VERBOSE, msg)
}
private inline fun log(
logLevel: LogLevel,
initializer: LogMessage.() -> Unit,
noinline printer: LogMessage.() -> String
) {
buffer.log(TAG, logLevel, initializer, printer)
}
private inline fun log(
logLevel: LogLevel,
initializer: LogMessage.() -> Unit,
noinline printer: LogMessage.() -> String
) {
buffer.log(TAG, logLevel, initializer, printer)
}
fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
log(
LogLevel.VERBOSE,
{ double1 = h.toDouble() },
{ "onQsIntercept: move action, QS tracking enabled. h = $double1" })
}
fun onQsInterceptMoveQsTrackingEnabled(h: Float) {
log(
LogLevel.VERBOSE,
{ double1 = h.toDouble() },
{ "onQsIntercept: move action, QS tracking enabled. h = $double1" }
)
}
fun logQsTrackingNotStarted(
initialTouchY: Float,
y: Float,
h: Float,
touchSlop: Float,
qsExpanded: Boolean,
collapsedOnDown: Boolean,
keyguardShowing: Boolean,
qsExpansionEnabled: Boolean
) {
log(
LogLevel.VERBOSE,
{
int1 = initialTouchY.toInt()
int2 = y.toInt()
long1 = h.toLong()
double1 = touchSlop.toDouble()
bool1 = qsExpanded
bool2 = collapsedOnDown
bool3 = keyguardShowing
bool4 = qsExpansionEnabled
},
{
"QsTrackingNotStarted: initTouchY=$int1,y=$int2,h=$long1,slop=$double1,qsExpanded=" +
"$bool1,collapsedDown=$bool2,keyguardShowing=$bool3,qsExpansion=$bool4"
})
}
fun logQsTrackingNotStarted(
initialTouchY: Float,
y: Float,
h: Float,
touchSlop: Float,
qsExpanded: Boolean,
collapsedOnDown: Boolean,
keyguardShowing: Boolean,
qsExpansionEnabled: Boolean
) {
log(
LogLevel.VERBOSE,
{
int1 = initialTouchY.toInt()
int2 = y.toInt()
long1 = h.toLong()
double1 = touchSlop.toDouble()
bool1 = qsExpanded
bool2 = collapsedOnDown
bool3 = keyguardShowing
bool4 = qsExpansionEnabled
},
{
"QsTrackingNotStarted: initTouchY=$int1,y=$int2,h=$long1,slop=$double1,qsExpanded" +
"=$bool1,collapsedDown=$bool2,keyguardShowing=$bool3,qsExpansion=$bool4"
}
)
}
fun logMotionEvent(event: MotionEvent, message: String) {
log(
LogLevel.VERBOSE,
{
str1 = message
long1 = event.eventTime
long2 = event.downTime
int1 = event.action
int2 = event.classification
double1 = event.y.toDouble()
},
{ "$str1\neventTime=$long1,downTime=$long2,y=$double1,action=$int1,classification=$int2" })
}
fun logMotionEvent(event: MotionEvent, message: String) {
log(
LogLevel.VERBOSE,
{
str1 = message
long1 = event.eventTime
long2 = event.downTime
int1 = event.action
int2 = event.classification
double1 = event.y.toDouble()
},
{
"$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
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
fun setUp() {
MockitoAnnotations.initMocks(this)
Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager = UncaughtExceptionPreHandlerManager()
}
@Test
fun registerHandler_registersOnceOnly() {
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
fun registerHandler_setsUncaughtExceptionPreHandler() {
Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager.registerHandler(mockHandler)
assertThat(Thread.getUncaughtExceptionPreHandler()).isNotNull()
}
@Test
fun registerHandler_preservesOriginalHandler() {
Thread.setUncaughtExceptionPreHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
@Ignore
fun registerHandler_toleratesHandlersThatThrow() {
`when`(mockHandler2.uncaughtException(any(), any())).thenThrow(RuntimeException())
preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler2, only()).uncaughtException(any(), any())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
fun registerHandler_doesNotSetUpTwice() {
UncaughtExceptionPreHandlerManager().registerHandler(mockHandler2)
assertThrows(IllegalStateException::class.java) {
preHandlerManager.registerHandler(mockHandler)
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager = UncaughtExceptionPreHandlerManager()
}
@Test
fun registerHandler_registersOnceOnly() {
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
fun registerHandler_setsUncaughtExceptionPreHandler() {
Thread.setUncaughtExceptionPreHandler(null)
preHandlerManager.registerHandler(mockHandler)
assertThat(Thread.getUncaughtExceptionPreHandler()).isNotNull()
}
@Test
fun registerHandler_preservesOriginalHandler() {
Thread.setUncaughtExceptionPreHandler(mockHandler)
preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
@Ignore
fun registerHandler_toleratesHandlersThatThrow() {
`when`(mockHandler2.uncaughtException(any(), any())).thenThrow(RuntimeException())
preHandlerManager.registerHandler(mockHandler2)
preHandlerManager.registerHandler(mockHandler)
preHandlerManager.handleUncaughtException(Thread.currentThread(), Exception())
verify(mockHandler2, only()).uncaughtException(any(), any())
verify(mockHandler, only()).uncaughtException(any(), any())
}
@Test
fun registerHandler_doesNotSetUpTwice() {
UncaughtExceptionPreHandlerManager().registerHandler(mockHandler2)
assertThrows(IllegalStateException::class.java) {
preHandlerManager.registerHandler(mockHandler)
}
}
}
}