Merge "Ensure TelecomAccountRegistry is HSUM aware." into main
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e670f70..daa4957 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -13565,10 +13565,10 @@
}
/**
- * Inform that Device is aligned to satellite for demo mode.
+ * Inform whether the device is aligned with the satellite in both real and demo mode.
*
- * @param isAligned {@code true} Device is aligned with the satellite for demo mode
- * {@code false} Device fails to align with the satellite for demo mode.
+ * @param isAligned {@code true} Device is aligned with the satellite.
+ * {@code false} Device fails to align with the satellite.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
index ede2377..bc60c9b 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
@@ -290,7 +290,7 @@
satellitePositionTextView.setText("startSatelliteTransmissionUpdates exception caught ="
+ e);
}
- //Device is aligned with the satellite for demo mode
+ //Device is aligned with the satellite
mSatelliteManager.setDeviceAlignedWithSatellite(true);
}
}