commit 59505806cf5dd20d4b5243e83b82f88a5e1033f2
author Chuck Liao <chuckliao@google.com> Tue Apr 28 12:32:35 2020 +0800
committer Chuck Liao <chuckliao@google.com> Tue Apr 28 13:14:35 2020 +0800
tree 4026f1d8159882b4947f6bb0df39b372653ef5d8
parent 3e064a18ff4c20977fe1fe4deba23e145ef7d057

Fix the exception when clicking "adding custom theme" tile.

Bug: 155137760
Change-Id: Ib6791837a0eed1a9f5938e400106380b4925ebd7

src/com/android/wallpaper/picker/BottomActionBarFragment.java

diff --git a/src/com/android/wallpaper/picker/BottomActionBarFragment.java b/src/com/android/wallpaper/picker/BottomActionBarFragment.java
index 961e4b9..bf3b997 100644
--- a/src/com/android/wallpaper/picker/BottomActionBarFragment.java
+++ b/src/com/android/wallpaper/picker/BottomActionBarFragment.java
@@ -15,6 +15,7 @@
  */
 package com.android.wallpaper.picker;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 
@@ -39,9 +40,12 @@
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mBottomActionBar = ((BottomActionBarHost) getActivity()).getBottomActionBar();
-        mBottomActionBar.bindBackButtonToSystemBackKey(getActivity());
-        onBottomActionBarReady(mBottomActionBar);
+        Activity activity = getActivity();
+        if (activity instanceof BottomActionBarHost) {
+            mBottomActionBar = ((BottomActionBarHost) activity).getBottomActionBar();
+            mBottomActionBar.bindBackButtonToSystemBackKey(activity);
+            onBottomActionBarReady(mBottomActionBar);
+        }
     }
 
     @Override