Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e43c767c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Validating non-empty authority and accountType"

parents f46ac0bf 83b66b22

core/java/android/content/SyncAdaptersCache.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.pm.RegisteredServicesCache; 
import android.content.pm.XmlSerializerAndParser;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.AttributeSet;

import android.util.SparseArray;
@@ -63,7 +64,7 @@ public class SyncAdaptersCache extends RegisteredServicesCache<SyncAdapterType> 
                    sa.getString(com.android.internal.R.styleable.SyncAdapter_contentAuthority);

            final String accountType =

                    sa.getString(com.android.internal.R.styleable.SyncAdapter_accountType);

            if (authority == null || accountType == null) {

            if (TextUtils.isEmpty(authority) || TextUtils.isEmpty(accountType)) {

                return null;

            }

            final boolean userVisible =