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

Commit 4d5d4fb7 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topics "area_info_refactor", "dbgf_test" 

* changes:
  Added device-based geo-fencing debug info support
  Refactored cell broadcast area info support
parents b8c90c7c 6bc3f184

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

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

<!--

/*

** Copyright 2020, 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-mcc732/config.xml

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

<!--

/*

** Copyright 2020, 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-mcc740/config.xml

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

<!--

/*

** Copyright 2020, 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>

data/etc/privapp-permissions-platform.xml

+3 −0
Original line number Diff line number Diff line
@@ -377,4 +377,7 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_DYNAMIC_SYSTEM"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.settings">

        <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>

    </privapp-permissions>

</permissions>

telephony/java/android/telephony/SmsCbMessage.java

+1 −0
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ public final class SmsCbMessage implements Parcelable { 
        cv.put(CellBroadcasts.SERIAL_NUMBER, getSerialNumber());

        cv.put(CellBroadcasts.SERVICE_CATEGORY, getServiceCategory());

        cv.put(CellBroadcasts.LANGUAGE_CODE, getLanguageCode());

        cv.put(CellBroadcasts.DATA_CODING_SCHEME, getDataCodingScheme());

        cv.put(CellBroadcasts.MESSAGE_BODY, getMessageBody());

        cv.put(CellBroadcasts.MESSAGE_FORMAT, getMessageFormat());

        cv.put(CellBroadcasts.MESSAGE_PRIORITY, getMessagePriority());