commit 7a4f060845ec73fdc191ae4fe7f93a62a8be8640
author Grant Menke <grantmenke@google.com> Thu Oct 10 15:29:14 2024 -0700
committer Grant Menke <grantmenke@google.com> Thu Oct 10 22:34:01 2024 +0000
tree 22dadfb3e3bb2804dafd866e885d0e9ccd71bff0
parent f77acc3821bbdc8d186f63717ff723f5eea3ac5b

Ensure TelecomAccountRegistry is HSUM aware.

This CL ensures TelecomAccountRegistry is consistent with HSUM best practices by removing the implication that the primary user is the same as the system user. That assumption is not true in HSUM mode. This CL renames mIsPrimaryUser to be consistent with HSUM best practices.

Test: variable name change only; no functional changes
Bug: 371634365
Flag: EXEMPT variable name update only
Change-Id: I43b648e62a776f45ec2dad0c4b669b73eff57b2c

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index c39d121..c7d97f5 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -434,7 +434,7 @@
             boolean isVideoEnabledByPlatform = ImsManager.getInstance(mPhone.getContext(),
                     mPhone.getPhoneId()).isVtEnabledByPlatform();
 
-            if (!mIsPrimaryUser) {
+            if (!mDoesUserSupportVideoCalling) {
                 Log.i(this, "Disabling video calling for secondary user.");
                 mIsVideoCapable = false;
                 isVideoEnabledByPlatform = false;
@@ -1214,7 +1214,7 @@
                 Log.i(this, "TelecomAccountRegistry: User changed, re-registering phone accounts.");
 
                 UserHandle currentUser = intent.getParcelableExtra(Intent.EXTRA_USER);
-                mIsPrimaryUser = currentUser == null ? true : currentUser.isSystem();
+                mDoesUserSupportVideoCalling = currentUser == null ? true : currentUser.isSystem();
 
                 // Any time the user changes, re-register the accounts.
                 tearDownAccounts();
@@ -1287,7 +1287,8 @@
     private int mSubscriptionListenerState = LISTENER_STATE_UNREGISTERED;
     private int mServiceState = ServiceState.STATE_POWER_OFF;
     private int mActiveDataSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-    private boolean mIsPrimaryUser = UserHandle.of(ActivityManager.getCurrentUser()).isSystem();
+    private boolean mDoesUserSupportVideoCalling =
+            UserHandle.of(ActivityManager.getCurrentUser()).isSystem();
     private ExponentialBackoff mRegisterSubscriptionListenerBackoff;
     private ExponentialBackoff mTelecomReadyBackoff;
     private final HandlerThread mHandlerThread = new HandlerThread("TelecomAccountRegistry");