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

am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""

Browse Source 
merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b
This commit is contained in:
Vinit Deshpande
2015-03-15 13:41:14 -07:00
parent 4447a5e2c7 da35a2b477
commit aae695b50d
1 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/android/provider/CallLog.java
View File

@@ -33,9 +33,7 @@ import android.provider.ContactsContract.CommonDataKinds.Callable;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.DataUsageFeedback;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
@@ -349,26 +347,17 @@ public class CallLog {
// that was encoded into call log databases.
/**
* The component name of the account used to place or receive the call; in string form.
* The component name of the account in string form.
* <P>Type: TEXT</P>
*/
public static final String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
/**
* The identifier for the account used to place or receive the call.
* The identifier of a account that is unique to a specified component.
* <P>Type: TEXT</P>
*/
public static final String PHONE_ACCOUNT_ID = "subscription_id";
/**
* The address associated with the account used to place or receive the call; in string
* form. For SIM-based calls, this is the user's own phone number.
* <P>Type: TEXT</P>
*
* @hide
*/
public static final String PHONE_ACCOUNT_ADDRESS = "phone_account_address";
/**
* Indicates that the entry will be hidden from all queries until the associated
* {@link android.telecom.PhoneAccount} is registered with the system.
@@ -380,12 +369,10 @@ public class CallLog {
public static final String PHONE_ACCOUNT_HIDDEN = "phone_account_hidden";
/**
* The subscription ID used to place this call. This is no longer used and has been
* replaced with PHONE_ACCOUNT_COMPONENT_NAME/PHONE_ACCOUNT_ID.
* For ContactsProvider internal use only.
* The identifier of a account that is unique to a specified component. Equivalent value
* to {@link #PHONE_ACCOUNT_ID}. For ContactsProvider internal use only.
* <P>Type: INTEGER</P>
*
* @Deprecated
* @hide
*/
public static final String SUB_ID = "sub_id";
@@ -456,22 +443,6 @@ public class CallLog {
final ContentResolver resolver = context.getContentResolver();
int numberPresentation = PRESENTATION_ALLOWED;
TelecomManager tm = null;
try {
tm = TelecomManager.from(context);
} catch (UnsupportedOperationException e) {}
String accountAddress = null;
if (tm != null && accountHandle != null) {
PhoneAccount account = tm.getPhoneAccount(accountHandle);
if (account != null) {
Uri address = account.getSubscriptionAddress();
if (address != null) {
accountAddress = address.getSchemeSpecificPart();
}
}
}
// Remap network specified number presentation types
// PhoneConstants.PRESENTATION_xxx to calllog number presentation types
// Calls.PRESENTATION_xxx, in order to insulate the persistent calllog
@@ -513,7 +484,6 @@ public class CallLog {
}
values.put(PHONE_ACCOUNT_COMPONENT_NAME, accountComponentString);
values.put(PHONE_ACCOUNT_ID, accountId);
values.put(PHONE_ACCOUNT_ADDRESS, accountAddress);
values.put(NEW, Integer.valueOf(1));
if (callType == MISSED_TYPE) {