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

Commit 40a2f98c authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" am: 9636d7e3 

am: 9e294c69

Change-Id: Iddbe0533660d30d86ee932b481020b85eb91e176
parents 99a254e3 9e294c69

core/java/android/provider/CallLog.java

+7 −9
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ import android.telephony.PhoneNumberUtils; 
import android.text.TextUtils;

import android.util.Log;



import com.android.internal.telephony.PhoneConstants;



import java.util.List;



/**
@@ -610,7 +608,7 @@ public class CallLog { 
         * if the contact is unknown.

         * @param context the context used to get the ContentResolver

         * @param number the phone number to be added to the calls db

         * @param presentation enum value from PhoneConstants.PRESENTATION_xxx, which

         * @param presentation enum value from TelecomManager.PRESENTATION_xxx, which

         *        is set by the network and denotes the number presenting rules for

         *        "allowed", "payphone", "restricted" or "unknown"

         * @param callType enumerated values for "incoming", "outgoing", or "missed"
@@ -645,7 +643,7 @@ public class CallLog { 
         * @param number the phone number to be added to the calls db

         * @param viaNumber the secondary number that the incoming call received with. If the

         *       call was received with the SIM assigned number, then this field must be ''.

         * @param presentation enum value from PhoneConstants.PRESENTATION_xxx, which

         * @param presentation enum value from TelecomManager.PRESENTATION_xxx, which

         *        is set by the network and denotes the number presenting rules for

         *        "allowed", "payphone", "restricted" or "unknown"

         * @param callType enumerated values for "incoming", "outgoing", or "missed"
@@ -686,7 +684,7 @@ public class CallLog { 
         *        if it was outgoing. Otherwise it is ''.

         * @param viaNumber the secondary number that the incoming call received with. If the

         *        call was received with the SIM assigned number, then this field must be ''.

         * @param presentation enum value from PhoneConstants.PRESENTATION_xxx, which

         * @param presentation enum value from TelecomManager.PRESENTATION_xxx, which

         *        is set by the network and denotes the number presenting rules for

         *        "allowed", "payphone", "restricted" or "unknown"

         * @param callType enumerated values for "incoming", "outgoing", or "missed"
@@ -1048,22 +1046,22 @@ public class CallLog { 


        /**

         * Remap network specified number presentation types

         * PhoneConstants.PRESENTATION_xxx to calllog number presentation types

         * TelecomManager.PRESENTATION_xxx to calllog number presentation types

         * Calls.PRESENTATION_xxx, in order to insulate the persistent calllog

         * from any future radio changes.

         * If the number field is empty set the presentation type to Unknown.

         */

        private static int getLogNumberPresentation(String number, int presentation) {

            if (presentation == PhoneConstants.PRESENTATION_RESTRICTED) {

            if (presentation == TelecomManager.PRESENTATION_RESTRICTED) {

                return presentation;

            }



            if (presentation == PhoneConstants.PRESENTATION_PAYPHONE) {

            if (presentation == TelecomManager.PRESENTATION_PAYPHONE) {

                return presentation;

            }



            if (TextUtils.isEmpty(number)

                    || presentation == PhoneConstants.PRESENTATION_UNKNOWN) {

                    || presentation == TelecomManager.PRESENTATION_UNKNOWN) {

                return PRESENTATION_UNKNOWN;

            }