diff options
| author | 2017-06-26 17:22:45 -0700 | |
|---|---|---|
| committer | 2017-06-26 17:22:45 -0700 | |
| commit | af73e7ea3fa91ee8810bb8d59c0ae4335a262df5 (patch) | |
| tree | 17d2d06445b81300c298295115cab7b2ebde741d | |
| parent | a178205e8bcaf9b4dd75c4618d53d30eb94c8802 (diff) | |
Don't assume device has on screen nav bar in RoundedCorners service.
Bug: 63039412
Test: manual
Change-Id: I9af3e1fb9d831dfb988c88b8ef78a52f2af4bef0
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/RoundedCorners.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/RoundedCorners.java b/packages/SystemUI/src/com/android/systemui/RoundedCorners.java index 6397eb5d756b..61325400846a 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, |