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

Merge "Add fields for PhoneAccount to CallerInfo"

Browse Source
This commit is contained in:
Hall Liu
2018-12-11 22:58:45 +00:00
committed by Gerrit Code Review
parent 91bd02534a 7d02a835ae
commit 833bc7dba7
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; package com.android.internal.telephony;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@@ -32,15 +33,15 @@ import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.RawContacts; import android.provider.ContactsContract.RawContacts;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.telephony.Rlog; import android.telephony.Rlog;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
import com.android.i18n.phonenumbers.NumberParseException; import com.android.i18n.phonenumbers.NumberParseException;
import com.android.i18n.phonenumbers.PhoneNumberUtil; import com.android.i18n.phonenumbers.PhoneNumberUtil;
import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import android.telephony.SubscriptionManager; import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
import java.util.Locale; import java.util.Locale;
@@ -112,6 +113,9 @@ public class CallerInfo {
public Uri contactRefUri; public Uri contactRefUri;
public String lookupKey; public String lookupKey;
public ComponentName preferredPhoneAccountComponent;
public String preferredPhoneAccountId;
public long userType; public long userType;
/** /**
@@ -264,6 +268,17 @@ public class CallerInfo {
info.contactDisplayPhotoUri = null; 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 // look for the custom ringtone, create from the string stored
// in the database. // in the database.
// An empty string ("") in the database indicates a silent ringtone, // An empty string ("") in the database indicates a silent ringtone,