From 7d58bfe3ad9b4ea8dd49de30ed903801e1654424 Mon Sep 17 00:00:00 2001
From: Simran Basi <sbasi@google.com>
Date: Wed, 15 Mar 2017 15:06:17 -0700
Subject: packages/apps/CarrierConfig: Add APCT tests to the device-tests
 suite.

This CL adds the APCT tests within this project to
a similar suite as CTS known as device-tests.

The current method of running APCT tests in the infrastructure
is unaffected.

Bug: 35882476
Test: `make dist device-tests -j` and local builds of
      continuous_instrumentation_tests & continuous_native_tests

Change-Id: I1a3af4dc570092b0d268bde59e486d829f5337f2
---
 tests/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Android.mk b/tests/Android.mk
index b0d3c22..fe6aa71 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,6 +9,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CarrierConfigTests
+LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CERTIFICATE := platform
 
 LOCAL_INSTRUMENTATION_FOR := CarrierConfig
-- 
cgit v1.2.3


From 376757e1b92fa430dbb045fd5935106edf1fdb62 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 15 Nov 2016 16:16:58 -0800
Subject: Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: Idf42967dc6a2a4d2d165d61bdac59e4c574a4cb6
Change-Id: Idf42967dc6a2a4d2d165d61bdac59e4c574a4cb6
---
 assets/carrier_config_44020.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index a25a5fd..61f7ae5 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -19,5 +19,6 @@
             <item value="0xA802,0xA804:type=etws_default, emergency=true" />
         </string-array>
         <string name="default_vm_number_string">1416</string>
+        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3