diff options
| author | 2022-03-17 06:51:58 +0000 | |
|---|---|---|
| committer | 2022-03-17 06:51:58 +0000 | |
| commit | f721b5fc1b578cfacdd0d667d85eea5d1729268a (patch) | |
| tree | ae5a79123a43624c478fa6557d24ded9e8249001 | |
| parent | be4ecfc58ec4a66a5c794c8a2a5d5f1319c7612a (diff) | |
| parent | 50a858875ed018c04d3926f2a0a75c36f1316fd3 (diff) | |
[automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17216149
Bug: 224685744
Bug: 224627240
Change-Id: Ia36ebbd31829e9e33d8fd559d228e139e63e679e
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java index 3531f17bb6a1..a2bee05246ce 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java @@ -78,8 +78,7 @@ public class UsbConfirmActivity extends AlertActivity String appName = mResolveInfo.loadLabel(packageManager).toString(); final AlertController.AlertParams ap = mAlertParams; - final int titleId = mUsbConfirmMessageHandler.getPromptTitleId(); - ap.mTitle = getString(titleId, appName, mDevice.getProductName()); + ap.mTitle = appName; boolean useRecordWarning = false; if (mDevice == null) { final int messageId = mUsbConfirmMessageHandler.getUsbAccessoryPromptId(); @@ -96,6 +95,8 @@ public class UsbConfirmActivity extends AlertActivity useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; final int messageId = mUsbConfirmMessageHandler.getMessageId(); + final int titleId = mUsbConfirmMessageHandler.getPromptTitleId(); + ap.mTitle = getString(titleId, appName, mDevice.getProductName()); ap.mMessage = (messageId != Resources.ID_NULL) ? getString(messageId, appName, mDevice.getProductName()) : null; mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java index 4b7ee03c1471..b9a37b1918f2 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java @@ -90,8 +90,7 @@ public class UsbPermissionActivity extends AlertActivity String appName = aInfo.loadLabel(packageManager).toString(); final AlertController.AlertParams ap = mAlertParams; - final int titleId = mUsbAudioPermissionMessageHandler.getPromptTitleId(); - ap.mTitle = getString(titleId, appName, mDevice.getProductName()); + ap.mTitle = appName; boolean useRecordWarning = false; if (mDevice == null) { // Accessory Case @@ -109,6 +108,8 @@ public class UsbPermissionActivity extends AlertActivity useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; final int messageId = mUsbAudioPermissionMessageHandler.getMessageId(); + final int titleId = mUsbAudioPermissionMessageHandler.getPromptTitleId(); + ap.mTitle = getString(titleId, appName, mDevice.getProductName()); ap.mMessage = (messageId != Resources.ID_NULL) ? getString(messageId, appName, mDevice.getProductName()) : null; mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); |