From 6b6d06b940a1ef3f54c2b7e7b6752d64341d90c2 Mon Sep 17 00:00:00 2001 From: Leo Neat Date: Thu, 28 May 2020 09:22:25 -0700 Subject: [PATCH 1/3] Null safe bug fix --- .../android/mediacontroller/MediaAppTestingActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt index fa3019e..657dce8 100644 --- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt +++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt @@ -1264,8 +1264,8 @@ class MediaAppTestingActivity : AppCompatActivity() { fun getScreenHeightPx(context: Context): Int { val displayMetrics = DisplayMetrics() val windowManager = ContextCompat.getSystemService(context, WindowManager::class.java) - val display = windowManager.defaultDisplay - display.getMetrics(displayMetrics) + val display = windowManager?.defaultDisplay + display?.getMetrics(displayMetrics) return displayMetrics.heightPixels } } From a973f34f3d13ff88bd8e849c56e112d003a62e30 Mon Sep 17 00:00:00 2001 From: Leo Neat Date: Thu, 28 May 2020 11:08:26 -0700 Subject: [PATCH 2/3] Nicole's comment --- .../android/mediacontroller/MediaAppTestingActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt index 657dce8..32c0186 100644 --- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt +++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt @@ -1263,9 +1263,10 @@ class MediaAppTestingActivity : AppCompatActivity() { // Gets the current screen height in pixels fun getScreenHeightPx(context: Context): Int { val displayMetrics = DisplayMetrics() - val windowManager = ContextCompat.getSystemService(context, WindowManager::class.java) - val display = windowManager?.defaultDisplay - display?.getMetrics(displayMetrics) + val windowManager = context.getSystemService(WindowManager::class.java) + ?: throw IllegalStateException("Could not get WindowManager") + val display = windowManager.defaultDisplay + display.getMetrics(displayMetrics) return displayMetrics.heightPixels } } From c57e29cc3532db8617bdd4cd307dea21b53411b1 Mon Sep 17 00:00:00 2001 From: Leo Neat Date: Thu, 28 May 2020 11:10:07 -0700 Subject: [PATCH 3/3] Nicole's comment --- .../example/android/mediacontroller/MediaAppTestingActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt index 32c0186..f5c6dc9 100644 --- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt +++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt @@ -50,6 +50,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.cardview.widget.CardView import androidx.core.content.ContextCompat +import androidx.core.content.ContextCompat.getSystemService import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -1263,7 +1264,7 @@ class MediaAppTestingActivity : AppCompatActivity() { // Gets the current screen height in pixels fun getScreenHeightPx(context: Context): Int { val displayMetrics = DisplayMetrics() - val windowManager = context.getSystemService(WindowManager::class.java) + val windowManager = getSystemService(context, WindowManager::class.java) ?: throw IllegalStateException("Could not get WindowManager") val display = windowManager.defaultDisplay display.getMetrics(displayMetrics)