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

Commit 577fa055 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Don't insert certain numbers into the call log" into pi-dev am: 4deb5938 

am: 93b26da8

Change-Id: I5abc5b8073245ab6bb5fbc61ea9e19284be661e5
parents 383e8279 93b26da8

core/res/res/values-mcc214/config.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2018, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <!-- String array containing numbers that shouldn't be logged

       016 present here for Spain's gender violence number -->

  <string-array translatable="false" name="unloggable_phone_numbers">

    <item>016</item>

  </string-array>

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2729,6 +2729,9 @@ 
         empty string is passed in -->

    <string name="config_ims_package"/>



    <!-- String array containing numbers that shouldn't be logged. Country-specific. -->

    <string-array name="unloggable_phone_numbers" />



    <!-- Flag specifying whether or not IMS will use the dynamic ImsResolver -->

    <bool name="config_dynamic_bind_ims">false</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,7 @@ 
  <java-symbol type="drawable" name="decor_maximize_button_light" />

  <java-symbol type="color" name="decor_button_dark_color" />

  <java-symbol type="color" name="decor_button_light_color" />

  <java-symbol type="array" name="unloggable_phone_numbers" />



  <!-- From TelephonyProvider -->

  <java-symbol type="xml" name="apns" />

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -224,6 +224,13 @@ public class CarrierConfigManager { 
    public static final String

            KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";



    /**

     * A string array containing numbers that shouldn't be included in the call log.

     * @hide

     */

    public static final String KEY_UNLOGGABLE_NUMBERS_STRING_ARRAY =

            "unloggable_numbers_string_array";



    /** If true, removes the Voice Privacy option from Call Settings */

    public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
@@ -2041,6 +2048,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL, false);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putStringArray(KEY_UNLOGGABLE_NUMBERS_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);

        sDefaults.putBoolean(KEY_PLAY_CALL_RECORDING_TONE_BOOL, false);

        sDefaults.putBoolean(KEY_APN_EXPAND_BOOL, true);