Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add fields for PhoneAccount to CallerInfo" am: 833bc7dba7 am: 5c8e7355c0

Browse Source 
am: b34a301827

Change-Id: I2b1712e6b8158b3ea1b9ed8411b6fb9a0ab5481d
This commit is contained in:
Hall Liu
2018-12-11 16:55:49 -08:00
committed by android-build-merger
parent ea93adecf8 b34a301827
commit 129d9d07a6
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@@ -17,6 +17,7 @@
package com.android.internal.telephony;
import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
@@ -32,15 +33,15 @@ import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.RawContacts;
import android.telephony.PhoneNumberUtils;
import android.telephony.Rlog;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
import com.android.i18n.phonenumbers.NumberParseException;
import com.android.i18n.phonenumbers.PhoneNumberUtil;
import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import android.telephony.SubscriptionManager;
import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
import java.util.Locale;
@@ -112,6 +113,9 @@ public class CallerInfo {
public Uri contactRefUri;
public String lookupKey;
public ComponentName preferredPhoneAccountComponent;
public String preferredPhoneAccountId;
public long userType;
/**
@@ -264,6 +268,17 @@ public class CallerInfo {
info.contactDisplayPhotoUri = null;
}
columnIndex = cursor.getColumnIndex(Data.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME);
if ((columnIndex != -1) && (cursor.getString(columnIndex) != null)) {
info.preferredPhoneAccountComponent =
ComponentName.unflattenFromString(cursor.getString(columnIndex));
}
columnIndex = cursor.getColumnIndex(Data.PREFERRED_PHONE_ACCOUNT_ID);
if ((columnIndex != -1) && (cursor.getString(columnIndex) != null)) {
info.preferredPhoneAccountId = cursor.getString(columnIndex);
}
// look for the custom ringtone, create from the string stored
// in the database.
// An empty string ("") in the database indicates a silent ringtone,