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

Commit 429499f8 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Refactored area update info support" into oc-dr1-dev 

am: 5af2d637

Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa
parents 157e5465 5af2d637

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

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Whether camera shutter sound is forced or not  (country specific). -->

    <bool name="config_camera_sound_forced">true</bool>

    <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->

    <bool name="config_showAreaUpdateInfoSettings">true</bool>

</resources>

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

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

<!--

/*

** Copyright 2017, 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 may 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.

*/

-->



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

    <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->

    <bool name="config_showAreaUpdateInfoSettings">true</bool>

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2960,4 +2960,7 @@ 


    <!-- An array of packages that need to be treated as type service in battery settings -->

    <string-array translatable="false" name="config_batteryPackageTypeService"/>



    <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->

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

</resources>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -3052,5 +3052,5 @@ 


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

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



  <java-symbol type="bool" name="config_showAreaUpdateInfoSettings" />

</resources>

telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ public class SmsCbConstants { 
    /** Private constructor for utility class. */

    private SmsCbConstants() { }



    /** Channel 50 required by Brazil. ID 0~999 is allocated by GSMA */

    public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50

            = 0x0032;



    /** Start of PWS Message Identifier range (includes ETWS and CMAS). */

    public static final int MESSAGE_ID_PWS_FIRST_IDENTIFIER

            = 0x1100; // 4352