OSDN Git Service

Settings: Animate pin/pattern fragment only if available
authorLuis Vidal <lvidal@cyngn.com>
Fri, 5 Aug 2016 19:54:12 +0000 (12:54 -0700)
committerGerrit Code Review <gerrit@cyanogenmod.org>
Tue, 9 Aug 2016 17:22:31 +0000 (10:22 -0700)
To prevent NPE, check if the PIN/Pattern/Password confirmation
fragment is available before performing animation

Change-Id: I4ae78569f953daa6696e96c8318a0c059aaf3502
TICKET: HAM-1397

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

index d9af800..2d78de2 100644 (file)
@@ -92,11 +92,17 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
     }
 
     public void prepareEnterAnimation() {
-        getFragment().prepareEnterAnimation();
+        final ConfirmDeviceCredentialBaseFragment f = getFragment();
+        if (f != null) {
+            f.prepareEnterAnimation();
+        }
     }
 
     public void startEnterAnimation() {
-        getFragment().startEnterAnimation();
+        final ConfirmDeviceCredentialBaseFragment f = getFragment();
+        if (f != null) {
+            f.startEnterAnimation();
+        }
     }
 
     /**