Ensure exceptions in WatchFaceControlService are logged
We now catch, log and rethrow exceptions in WatchFaceControlService
methods. Previously the callstack was getting lost which made it
hard to diagnose errors.
PS I don't know why the test change was needed but it won't compile
without it.
Bug: 218550310
Test: N/A
Change-Id: Ibc564eaa037d128644cc738302d1636e72aa9cb2
diff --git a/wear/watchface/watchface-guava/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt b/wear/watchface/watchface-guava/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt
index 94faf43..bae0350 100644
--- a/wear/watchface/watchface-guava/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt
+++ b/wear/watchface/watchface-guava/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlTestService.kt
@@ -61,7 +61,10 @@
private val realService = object : WatchFaceControlService() {
override fun createServiceStub(): IWatchFaceInstanceServiceStub =
- object : IWatchFaceInstanceServiceStub(this, Handler(Looper.getMainLooper())) {
+ object : IWatchFaceInstanceServiceStub(
+ ApplicationProvider.getApplicationContext<Context>(),
+ Handler(Looper.getMainLooper())
+ ) {
@RequiresApi(Build.VERSION_CODES.O_MR1)
override fun getApiVersion(): Int = apiVersionOverride ?: super.getApiVersion()
}