From af73e7ea3fa91ee8810bb8d59c0ae4335a262df5 Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Mon, 26 Jun 2017 17:22:45 -0700 Subject: [PATCH] Don't assume device has on screen nav bar in RoundedCorners service. Bug: 63039412 Test: manual Change-Id: I9af3e1fb9d831dfb988c88b8ef78a52f2af4bef0 --- .../SystemUI/src/com/android/systemui/RoundedCorners.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/RoundedCorners.java b/packages/SystemUI/src/com/android/systemui/RoundedCorners.java index 6397eb5d756be..61325400846a9 100644 --- a/packages/SystemUI/src/com/android/systemui/RoundedCorners.java +++ b/packages/SystemUI/src/com/android/systemui/RoundedCorners.java @@ -98,9 +98,13 @@ public class RoundedCorners extends SystemUI implements Tunable { TunablePadding.addTunablePadding(statusBar.findViewById(R.id.keyguard_header), PADDING, padding, FLAG_END); - FragmentHostManager.get(sb.getNavigationBarWindow()).addTagListener( + View navigationBarWindow = sb.getNavigationBarWindow(); + // Not all devices have on screen navigation bars. + if (navigationBarWindow != null) { + FragmentHostManager.get(navigationBarWindow).addTagListener( NavigationBarFragment.TAG, new TunablePaddingTagListener(padding, 0)); + } FragmentHostManager fragmentHostManager = FragmentHostManager.get(statusBar); fragmentHostManager.addTagListener(CollapsedStatusBarFragment.TAG,