summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Lin <jamescflin@google.com> 2019-08-20 20:27:42 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-20 20:27:42 -0700
commit22c7dec4b7482f7e799d8e98d92f0f52bc9c33b1 (patch)
treeba1a2322c57e762bd9e7435ad7997afe8537fd89
parentcc437bf66f2ceba1152edef3668f7b6f80ce0c44 (diff)
parent507bc4ac3615b25ed834ced565ef0ba62aac123a (diff)
Merge "Remove the Phone registration error notification" into qt-qpr1-dev
am: 507bc4ac36 Change-Id: Ia3e54831a25be0dca455e9ba78d76cfb8842858b
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 29eb82648cef..e6a4baa2eae4 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -3552,7 +3552,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, false);
- sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);
+ sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, true);
sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");
sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,
false);