commit d9a427ed65530d1f1f0ced25e58ffc7718ecc026
author Sanket Padawe <sanketpadawe@google.com> Thu Jun 08 12:03:07 2017 -0700
committer Sanket Padawe <sanketpadawe@google.com> Thu Jul 06 15:57:26 2017 -0700
tree bbcadab4852ab5ea4bba2d4b31ab214fff327970
parent 13287dfeb826c7aa22f739e18597a20628e74130

Do not show datadisconnectRoaming notification if data is disabled.

Bug: 62447655
Test: manual
Change-Id: Iff5b06f34e9057d5470b63f720eed546c0bc99d1

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 2ed5139..1d61c8e 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -680,10 +680,12 @@
                 // if (a) you have the "data roaming" feature turned off, and
                 // (b) you just lost data connectivity because you're roaming.
                 // (c) if we haven't shown the notification for this disconnection earlier.
+                // (d) if data was enabled for the sim
                 if (!mDataDisconnectedDueToRoaming
                         && PhoneConstants.DataState.DISCONNECTED.name().equals(state)
                         && Phone.REASON_ROAMING_ON.equals(reason)
-                        && !phone.getDataRoamingEnabled()) {
+                        && !phone.getDataRoamingEnabled()
+                        && phone.getDataEnabled()) {
                     // Notify the user that data call is disconnected due to roaming. Note that
                     // calling this multiple times will not cause multiple notifications.
                     mHandler.sendEmptyMessage(EVENT_DATA_ROAMING_DISCONNECTED);