Merge "[Fix NPE]: Add a null check" into main (61e0c5de) · Commits · e / os / android_frameworks_base

core/java/android/view/autofill/AutofillClientController.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -94,8 +94,15 @@ public final class AutofillClientController implements AutofillManager.AutofillC
	* @hide		* @hide
	*/		*/
	public boolean isRelayoutFixEnabled() {		public boolean isRelayoutFixEnabled() {
			AutofillManager autofillManager = getAutofillManager();
			if (autofillManager == null) {
			if (Helper.sDebug) {
			Log.d(TAG, "isRelayoutFixEnabled() : getAutofillManager() == null");
			}
			return false;
			}
	if (mRelayoutFix == null) {		if (mRelayoutFix == null) {
	mRelayoutFix = getAutofillManager().isRelayoutFixEnabled();		mRelayoutFix = autofillManager.isRelayoutFixEnabled();
	}		}
	return mRelayoutFix;		return mRelayoutFix;
	}		}