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

[DO NOT MERGE] Fix unexpectedly NPE on CF when calling

Browse Source 
mDevice.getProductName()

Move the mDevice.getProductName() into mDevice NPE check condition.

Bug: 224685744
Bug: 224627240

Test: manually install NeutronPlayer to test usb audio device
permission warning dialog sentence.
Test: atest SystemUITests
Test: atest com.android.systemui.usb
.UsbPermissionActivityTest#testHideNonSystemOverlay

Change-Id: Ic5fecc1e98072eda6dcc48a3adc669ef731a4c9c
This commit is contained in:
Jason Chang
2022-03-16 16:08:56 +08:00
parent 5cbb4d7d27
commit 50a858875e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java
View File

@@ -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);

5
packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java
View File

@@ -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);