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

Commit 742a662f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0.c1-00002. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1073039   I037c6b757f7b65a1cddb6b7feeb9c78be1a15164   SystemUI: Support forbidden and greyed data icons
1082441   Id1db747c61bb2dd33515ac45cdc2059844d3e4f5   Fix broadcast receiver leak by creating seperate Profile
1039373 1082927   Icef46c725286655c42050ca4fa4ac45889284b82   Add a new feature for recording data usage of video call
1072247   I254312b5256413f1a4e9ca8609db15cd25bfab94   Fonts: Add support for Reverie font render engine
1077321   I535c0372447abcc4f189132f57899602b23e8cbb   Update the tether apn data for TIM-IT.
1068718   I4e3523bb9b1b704ae3b341fbc9303dd8d6c428ae   server: Fix static code Analyzer issues
1064317   I459b3dee5e679432595f97a55ce7b72c4c3777d8   Bluetooth: DUT discovery the correct adapter name
1077321   I765b35d0d7becd476288de0107780530051e6d84   Add Tethering APN
1069980   I635421440d262a7d51d5955c15343d65dc1ae32c   Bluetooth: Handle user switch with new states

Change-Id: Iaa7f1d0f87ba7ef35003481dca3710cb1c97365c
CRs-Fixed: 1069980, 1064317, 1082927, 1082441, 1073039, 1039373, 1072247, 1068718, 1077321
parents eebb3a7b cac689ef

core/java/android/net/INetworkStatsService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -67,4 +67,6 @@ interface INetworkStatsService { 
    /** Unregisters a callback on data usage. */

    void unregisterUsageRequest(in DataUsageRequest request);



    /** record video call data usage. */

    void recordVideoCallData(String iface, int ifaceType, long rxBytes, long txBytes);

}

core/java/android/net/NetworkIdentity.java

+5 −1
Original line number Diff line number Diff line
@@ -182,7 +182,11 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            roaming = state.networkInfo.isRoaming();



            metered = !state.networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

                    NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

                    || (context.getResources().getBoolean(

                    com.android.internal.R.bool.config_video_call_datausage_enable)

                    && state.networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_IMS));



        } else if (type == TYPE_WIFI) {

            if (state.networkId != null) {

core/res/res/values-mcc202-mnc05/config.xml

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

<!--

Copyright (c) 2016, The Linux Foundation. All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.



THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

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

       <item>Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</item>

    </string-array>

</resources>

core/res/res/values-mcc216-mnc70/config.xml

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

<!--

Copyright (c) 2016, The Linux Foundation. All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.



THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

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

       <item>Tethering Vodafone Internet,internet.vodafone.net,,,,,,,,,216,70,,DUN</item>

    </string-array>

</resources>

core/res/res/values-mcc222-mnc01/config.xml

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

<!--

Copyright (c) 2016, The Linux Foundation. All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.



THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



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

     for different hardware and product builds.  Do not translate. -->

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

    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

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

      <item>TIM WEB,ibox.tim.it,,,,,,,,,222,01,0,DUN</item>

    </string-array>



</resources>