Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a bug that the QuickAccessWalletTile displaying packageName as title." into sc-dev am: 851904a45c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237268

Change-Id: I95fcaaf6c756a9b1f45d1e224cd0d3f4aa89106d
This commit is contained in:
Silin Huang
2021-07-09 18:33:04 +00:00
committed by Automerger Merge Worker
parent ff5f95ecf5 851904a45c
commit 3f9ea37a52
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java
View File

@@ -153,9 +153,25 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> {
});
}
@Nullable
private CharSequence getServiceLabelSafe() {
try {
return mController.getWalletClient().getServiceLabel();
} catch (RuntimeException e) {
Log.e(TAG, "Failed to get the service label safely, recreating wallet client", e);
mController.reCreateWalletClient();
try {
return mController.getWalletClient().getServiceLabel();
} catch (RuntimeException e2) {
Log.e(TAG, "The QAW service label is broken.", e2);
return null;
}
}
}
@Override
protected void handleUpdateState(State state, Object arg) {
CharSequence label = mController.getWalletClient().getServiceLabel();
CharSequence label = getServiceLabelSafe();
state.label = label == null ? mLabel : label;
state.contentDescription = state.label;
Drawable tileIcon = mController.getWalletClient().getTileIcon();

14
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
View File

@@ -30,6 +30,7 @@ import static junit.framework.TestCase.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -255,6 +256,19 @@ public class QuickAccessWalletTileTest extends SysuiTestCase {
assertThat(nextStartedIntent.getComponent().getClassName()).isEqualTo(walletClassName);
}
@Test
public void testGetServiceLabelUnsafe_recreateWalletClient() {
doAnswer(invocation -> {
throw new Exception("Bad service label.");
}).when(mQuickAccessWalletClient).getServiceLabel();
QSTile.State state = new QSTile.State();
mTile.handleUpdateState(state, null);
verify(mController).reCreateWalletClient();
}
@Test
public void testHandleUpdateState_updateLabelAndIcon() {
QSTile.State state = new QSTile.State();