diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-19 23:15:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-19 23:15:12 +0000 |
| commit | 0a7b301e28d227400f21143a8027ab6580057d01 (patch) | |
| tree | 235ab5ab9f9215782c29ef350d275fe12e7b2f74 /java/com/android/dialer/app/list/AllContactsFragment.java | |
| parent | 444ba7afdfcec7ae59f2a7b5c784f5be91dbcaea (diff) | |
| parent | ea7890cd5e829ed3f0b5f726561c569690af2030 (diff) | |
| download | android_packages_apps_Dialer-0a7b301e28d227400f21143a8027ab6580057d01.tar.gz android_packages_apps_Dialer-0a7b301e28d227400f21143a8027ab6580057d01.tar.bz2 android_packages_apps_Dialer-0a7b301e28d227400f21143a8027ab6580057d01.zip | |
Update AOSP Dialer source from internal google3 repository at cl/159428781.
am: ea7890cd5e
Change-Id: I4f5e2f0040f9d8749856b6a51fb2befa398f8e4c
Diffstat (limited to 'java/com/android/dialer/app/list/AllContactsFragment.java')
| -rw-r--r-- | java/com/android/dialer/app/list/AllContactsFragment.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java index f5fdb9e2d..32a99e795 100644 --- a/java/com/android/dialer/app/list/AllContactsFragment.java +++ b/java/com/android/dialer/app/list/AllContactsFragment.java @@ -38,6 +38,7 @@ import com.android.contacts.common.list.ContactEntryListFragment; import com.android.contacts.common.list.ContactListFilter; import com.android.contacts.common.list.DefaultContactListAdapter; import com.android.dialer.app.R; +import com.android.dialer.common.LogUtil; import com.android.dialer.compat.CompatUtils; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; @@ -46,6 +47,7 @@ import com.android.dialer.util.IntentUtil; import com.android.dialer.util.PermissionsUtil; import com.android.dialer.widget.EmptyContentView; import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener; +import java.util.Arrays; /** Fragments to show all contacts with phone numbers. */ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryListAdapter> @@ -173,9 +175,15 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi return; } - if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) { + String[] deniedPermissions = + PermissionsUtil.getPermissionsCurrentlyDenied( + getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer); + if (deniedPermissions.length > 0) { + LogUtil.i( + "AllContactsFragment.onEmptyViewActionButtonClicked", + "Requesting permissions: " + Arrays.toString(deniedPermissions)); FragmentCompat.requestPermissions( - this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE); + this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE); } else { // Add new contact DialerUtils.startActivityWithErrorToast( |