diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2021-09-06 10:36:50 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2021-09-27 21:17:05 +0800 |
| commit | 1b162167c3e1a9d5e1731666a3bed2d76329a6cb (patch) | |
| tree | eaa9a74fe98ea602de4d86df61dc5ab0ab09e800 | |
| parent | 05568d9edda0458d238f3d962c9ed3e10ee4dd15 (diff) | |
fixup! VolumeDialog: avoid NPE in MediaOutputView
E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.String.equals(java.lang.Object)' on a null object reference
E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl.updateMediaOutputViewH(VolumeDialogImpl.java:902)
E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl.access$4800(VolumeDialogImpl.java:128)
E AndroidRuntime: at com.android.systemui.volume.VolumeDialogImpl$H.handleMessage(VolumeDialogImpl.java:1906)
E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:106)
E AndroidRuntime: at android.os.Looper.loop(Looper.java:223)
E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:7664)
E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
E AndroidRuntime: at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:592)
E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:954)
Change-Id: If4aa70fc7f4051a786dade8fd9ff124f3737786a
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 74605da708d7..9545d794904a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -899,9 +899,14 @@ public class VolumeDialogImpl implements VolumeDialog, if (row.device.isConnected()) { boolean active = row.device.equals(mLocalMediaManager.getCurrentConnectedDevice()); row.name.setText(row.device.getName()); - Util.setVisOrGone(row.summary, !row.device.getSummary().equals("")); - row.summary.setText(row.device.getSummary()); - Util.setVisOrGone(row.selected, active); + if (row.device.getSummary() != null) { + Util.setVisOrGone(row.summary, !row.device.getSummary().equals("")); + row.summary.setText(row.device.getSummary()); + Util.setVisOrGone(row.selected, active); + } else { + Util.setVisOrGone(row.summary, false); + Util.setVisOrGone(row.selected, false); + } if (!row.addedToGroup) { mMediaOutputView.addView(row.view); row.addedToGroup = true; |