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

Commit b86bbd90 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5606001 from 11a40d81 to qt-qpr1-release 

Change-Id: I279cb0d929e6ca882bd253a74ae9fb1eb875026d
parents f49a8eca 11a40d81

src/com/android/contacts/model/ContactLoader.java

+25 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.res.AssetFileDescriptor;

import android.content.res.Resources;

import android.database.Cursor;
@@ -42,6 +43,7 @@ import com.android.contacts.GroupMetaDataLoader; 
import com.android.contacts.compat.CompatUtils;

import com.android.contacts.group.GroupMetaData;

import com.android.contacts.model.account.AccountType;

import com.android.contacts.model.account.GoogleAccountType;

import com.android.contacts.model.dataitem.DataItem;

import com.android.contacts.model.dataitem.PhoneDataItem;

import com.android.contacts.model.dataitem.PhotoDataItem;
@@ -881,13 +883,34 @@ public class ContactLoader extends AsyncTaskLoader<Contact> { 
            mNotifiedRawContactIds.add(rawContactId);

            final AccountType accountType = rawContact.getAccountType(context);

            final String serviceName = accountType.getViewContactNotifyServiceClassName();

            final String servicePackageName = accountType.getViewContactNotifyServicePackageName();

            final String servicePackageName = accountType

                .getViewContactNotifyServicePackageName();

            if (!TextUtils.isEmpty(serviceName) && !TextUtils.isEmpty(servicePackageName)) {

                final Uri uri = ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId);

                final Intent intent = new Intent();

                intent.setDataAndType(uri, RawContacts.CONTENT_ITEM_TYPE);

                if (accountType instanceof GoogleAccountType) {

                    intent.setPackage(servicePackageName);

                    intent

                        .setAction("com.google.android.syncadapters.contacts.SYNC_HIGH_RES_PHOTO");

                    List<ResolveInfo> broadcastReceivers =

                        context.getPackageManager().queryBroadcastReceivers(intent, 0);

                    if (!broadcastReceivers.isEmpty()) {

                        if (Log.isLoggable(TAG, Log.DEBUG)) {

                            for (ResolveInfo broadcastReceiver : broadcastReceivers) {

                                Log.d(TAG, broadcastReceiver.activityInfo.toString());

                            }

                        }

                        context.sendBroadcast(intent);

                        continue;

                    }

                }

                // TODO: Social Stream API is deprecated, and once the opted-in

                // sync adapters target Android O+, we won't be able to start their services

                // since they'll likely be in the background, so we'll need to remove the

                // startService call.

                intent.setClassName(servicePackageName, serviceName);

                intent.setAction(Intent.ACTION_VIEW);

                intent.setDataAndType(uri, RawContacts.CONTENT_ITEM_TYPE);

                try {

                    context.startService(intent);

                } catch (Exception e) {