commit b81116aa99cc2f21dffd1abe221180f75fdf946f
author Grace Jia <xiaotonj@google.com> Mon Sep 14 14:57:07 2020 -0700
committer Grace Jia <xiaotonj@google.com> Wed Oct 07 16:44:59 2020 +0000
tree 910cd2f1f1294afb37fd6132e1f555d1bc2254c2
parent 203e00cda4d65dca3a30a828ded1be9c7bc766d5

Change ImsPhoneCallTracker to listen to the correct broadcast when
default dialer changed.

ImsPhoneCallTracker used to listen to protected broadcast ACTION_CHANGE_DEFAULT_DIALER
instead of ACTION_DEFAULT_DIALER_CHANGED. Fixed this to make
ImsPhoneCallTracker know the change of default dialer and prevent
untrusted app from setting mDefaultDialerUid.

Bug: 162741489
Test: Manually set default dialer to another app and check if
mDefaultDialerUid changed correspondingly by dumpsys.

Change-Id: I2335eb77b337454082f8c9db195fd8ecc4b2c72c

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index 0d52ea1..5af06a3 100755
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -335,7 +335,7 @@
                     log("onReceive : Updating mAllowEmergencyVideoCalls = " +
                             mAllowEmergencyVideoCalls);
                 }
-            } else if (TelecomManager.ACTION_CHANGE_DEFAULT_DIALER.equals(intent.getAction())) {
+            } else if (TelecomManager.ACTION_DEFAULT_DIALER_CHANGED.equals(intent.getAction())) {
                 mDefaultDialerUid.set(getPackageUid(context, intent.getStringExtra(
                         TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME)));
             }
@@ -879,7 +879,7 @@
 
         IntentFilter intentfilter = new IntentFilter();
         intentfilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
-        intentfilter.addAction(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
+        intentfilter.addAction(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED);
         mPhone.getContext().registerReceiver(mReceiver, intentfilter);
         cacheCarrierConfiguration(mPhone.getSubId());