Merge cherrypicks of ['googleplex-android-review.googlesource.com/23667755'] into udc-release.
Change-Id: I1ba0b3f6fb4038dc836e0bc0abb7b199f76fce36
This commit is contained in:
@@ -623,9 +623,9 @@ public class FingerprintSettings extends SubSettings {
|
|||||||
return; // Activity went away
|
return; // Activity went away
|
||||||
}
|
}
|
||||||
|
|
||||||
final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
|
mAddFingerprintPreference = findPreference(KEY_FINGERPRINT_ADD);
|
||||||
|
|
||||||
if (addPreference == null) {
|
if (mAddFingerprintPreference == null) {
|
||||||
return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()
|
return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user