Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5581402d authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

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

Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()" into sc-v2-dev
parents 4f7c6408 50a85887

packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -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);