PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null pointer exception when updating action bar shadow." into oc-mr1-dev

Browse Source 
am: 51fb9ad956

Change-Id: I5df37cf381ef448bda838756b466f78d85fa8f8b
This commit is contained in:
Doris Ling
2017-07-28 17:25:51 +00:00
committed by android-build-merger
parent 1e719a0ed7 51fb9ad956
commit 7cdb94384f
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/widget/ActionBarShadowController.java
View File

@@ -121,7 +121,7 @@ public class ActionBarShadowController implements LifecycleObserver, OnStart, On
final boolean shouldShowShadow = view.canScrollVertically(-1);
if (mAnchorView != null) {
mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
} else {
} else if (mActivity != null) { // activity can become null when running monkey
final ActionBar actionBar = mActivity.getActionBar();
if (actionBar != null) {
actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);