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

Merge changes from topic "presubmit-am-388f21e202994dfcb871fff05c757ba6" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e
  [DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()
This commit is contained in:
Jason Chang
2022-03-17 08:40:20 +00:00
committed by Android (Google) Code Review
parent a8cd5cb32f f721b5fc1b
commit ea33988637
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(); String appName = mResolveInfo.loadLabel(packageManager).toString();
final AlertController.AlertParams ap = mAlertParams; final AlertController.AlertParams ap = mAlertParams;
final int titleId = mUsbConfirmMessageHandler.getPromptTitleId(); ap.mTitle = appName;
ap.mTitle = getString(titleId, appName, mDevice.getProductName());
boolean useRecordWarning = false; boolean useRecordWarning = false;
if (mDevice == null) { if (mDevice == null) {
final int messageId = mUsbConfirmMessageHandler.getUsbAccessoryPromptId(); final int messageId = mUsbConfirmMessageHandler.getUsbAccessoryPromptId();
@@ -96,6 +95,8 @@ public class UsbConfirmActivity extends AlertActivity
useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; useRecordWarning = isAudioCaptureDevice && !hasRecordPermission;
final int messageId = mUsbConfirmMessageHandler.getMessageId(); 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, ap.mMessage = (messageId != Resources.ID_NULL) ? getString(messageId, appName,
mDevice.getProductName()) : null; mDevice.getProductName()) : null;
mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); 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(); String appName = aInfo.loadLabel(packageManager).toString();
final AlertController.AlertParams ap = mAlertParams; final AlertController.AlertParams ap = mAlertParams;
final int titleId = mUsbAudioPermissionMessageHandler.getPromptTitleId(); ap.mTitle = appName;
ap.mTitle = getString(titleId, appName, mDevice.getProductName());
boolean useRecordWarning = false; boolean useRecordWarning = false;
if (mDevice == null) { if (mDevice == null) {
// Accessory Case // Accessory Case
@@ -109,6 +108,8 @@ public class UsbPermissionActivity extends AlertActivity
useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; useRecordWarning = isAudioCaptureDevice && !hasRecordPermission;
final int messageId = mUsbAudioPermissionMessageHandler.getMessageId(); 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, ap.mMessage = (messageId != Resources.ID_NULL) ? getString(messageId, appName,
mDevice.getProductName()) : null; mDevice.getProductName()) : null;
mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice); mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice);