Merge "Fix watch face library crash with GW prior to T KR2" into androidx-main
diff --git a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt
index 9381afd..2952487 100644
--- a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt
+++ b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/control/InteractiveInstanceManager.kt
@@ -16,6 +16,7 @@
package androidx.wear.watchface.control
+import android.os.Build
import android.util.Log
import androidx.annotation.UiThread
import androidx.annotation.VisibleForTesting
@@ -198,7 +199,10 @@
val engine = impl.engine!!
engine.setUserStyle(value.params.userStyle)
- if (engine.resourceOnlyWatchFacePackageName !=
+ // Note prior to android U, auxiliaryComponentPackageName may be non null for regular
+ // watch faces.
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE &&
+ engine.resourceOnlyWatchFacePackageName !=
value.params.auxiliaryComponentPackageName
) {
val message =
