diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-22 10:25:41 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-22 10:25:41 +0000 |
commit | a058df59fdb80b577778794dd311312ec1b6b3d7 (patch) | |
tree | 05964a2d7abdcafbbcde6618d1d2bc858a6eea15 | |
parent | eb433479094ebfe9d142ce496281b0de0a4c1889 (diff) | |
parent | 04eda28970f93fa46dbd7f6c247ed1ccc468242f (diff) |
Snap for 9791699 from 04eda28970f93fa46dbd7f6c247ed1ccc468242f to t-keystone-qcom-release
Change-Id: If379e199f78a99551126fdb94cb5fa0d80fbfe0d
7 files changed, 53 insertions, 4 deletions
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c1bf882e7927..760dcaee0b0e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -12,6 +12,10 @@ ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ** See the License for the specific language governing permissions and ** limitations under the License. +** +** Changes from Qualcomm Innovation Center are provided under the following license: +** Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. +** SPDX-License-Identifier: BSD-3-Clause-Clear */ --> <resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 9540aec7ced8..24a7ca1c40a0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -1,3 +1,9 @@ +/* + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear + */ + package com.android.settingslib; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USER_LABEL; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java index b599dd82f7f3..d52ab4c98e01 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java @@ -12,6 +12,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ package com.android.settingslib.wifi; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index d30402466d8d..bcb5a184a8b7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -14,6 +14,12 @@ * limitations under the License. */ +/** + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear + */ + package com.android.systemui.qs.tiles; import android.annotation.NonNull; @@ -60,6 +66,7 @@ import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.connectivity.SignalCallback; import com.android.systemui.statusbar.connectivity.WifiIcons; import com.android.systemui.statusbar.connectivity.WifiIndicators; +import com.android.systemui.util.CarrierNameCustomization; import java.io.PrintWriter; @@ -78,6 +85,7 @@ public class InternetTile extends QSTileImpl<SignalState> { protected final InternetSignalCallback mSignalCallback = new InternetSignalCallback(); private final InternetDialogFactory mInternetDialogFactory; final Handler mHandler; + private CarrierNameCustomization mCarrierNameCustomization; @Inject public InternetTile( @@ -91,7 +99,8 @@ public class InternetTile extends QSTileImpl<SignalState> { QSLogger qsLogger, NetworkController networkController, AccessPointController accessPointController, - InternetDialogFactory internetDialogFactory + InternetDialogFactory internetDialogFactory, + CarrierNameCustomization carrierNameCustomization ) { super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); @@ -101,6 +110,7 @@ public class InternetTile extends QSTileImpl<SignalState> { mAccessPointController = accessPointController; mDataController = mController.getMobileDataController(); mController.observe(getLifecycle(), mSignalCallback); + mCarrierNameCustomization = carrierNameCustomization; } @Override @@ -287,8 +297,14 @@ public class InternetTile extends QSTileImpl<SignalState> { // Not data sim, don't display. return; } - mCellularInfo.mDataSubscriptionName = indicators.qsDescription == null - ? mController.getMobileDataNetworkName() : indicators.qsDescription; + if (mCarrierNameCustomization.isRoamingCustomizationEnabled() + && mCarrierNameCustomization.isRoaming(indicators.subId)) { + mCellularInfo.mDataSubscriptionName = + mCarrierNameCustomization.getRoamingCarrierName(indicators.subId); + } else { + mCellularInfo.mDataSubscriptionName = indicators.qsDescription == null + ? mController.getMobileDataNetworkName() : indicators.qsDescription; + } mCellularInfo.mDataContentDescription = indicators.qsDescription != null ? indicators.typeContentDescriptionHtml : null; mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java index 78708ff5e7f1..2c50a8c51b72 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java @@ -12,6 +12,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ package com.android.systemui.statusbar.connectivity; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java index 9cba877983b6..f4eca1b89b14 100755 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java @@ -12,7 +12,12 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ + package com.android.systemui.statusbar.connectivity; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java index d91baa5e7fcb..1e55ef48fbd9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java @@ -14,6 +14,12 @@ * limitations under the License. */ +/** + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear + */ + package com.android.systemui.qs.tiles; import static com.google.common.truth.Truth.assertThat; @@ -39,6 +45,7 @@ import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tiles.dialog.InternetDialogFactory; import com.android.systemui.statusbar.connectivity.AccessPointController; import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.util.CarrierNameCustomization; import org.junit.Before; import org.junit.Test; @@ -59,6 +66,8 @@ public class InternetTileTest extends SysuiTestCase { private AccessPointController mAccessPointController; @Mock private InternetDialogFactory mInternetDialogFactory; + @Mock + private CarrierNameCustomization mCarrierNameCustomization; private TestableLooper mTestableLooper; private InternetTile mTile; @@ -81,7 +90,8 @@ public class InternetTileTest extends SysuiTestCase { mock(QSLogger.class), mNetworkController, mAccessPointController, - mInternetDialogFactory + mInternetDialogFactory, + mCarrierNameCustomization ); mTile.initialize(); |