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

Commit c87079ff authored by Paul Mclean's avatar Paul Mclean Committed by Android (Google) Code Review
Browse files

Merge "Add "record through USB" warning to UsbConfirmActivity."

parents 3ceb4fd2 79ce5e08

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ 
    <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->

    <string name="usb_device_confirm_prompt">Open <xliff:g id="application">%1$s</xliff:g> to handle <xliff:g id="usb_device">%2$s</xliff:g>?</string>



    <!-- Prompt for the USB device confirm dialog with warning text for USB device dialogs.  [CHAR LIMIT=200] -->

    <string name="usb_device_confirm_prompt_warn">Open <xliff:g id="application" example= "Usb Mega Player">%1$s</xliff:g> to handle <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device.</string>



    <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->

    <string name="usb_accessory_confirm_prompt">Open <xliff:g id="application">%1$s</xliff:g> to handle <xliff:g id="usb_accessory">%2$s</xliff:g>?</string>

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

+16 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.PermissionChecker;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.hardware.usb.IUsbManager;
@@ -63,6 +64,7 @@ public class UsbConfirmActivity extends AlertActivity 
        mDevice = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);

        mAccessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);

        mResolveInfo = (ResolveInfo) intent.getParcelableExtra("rinfo");

        String packageName = intent.getStringExtra(UsbManager.EXTRA_PACKAGE);



        PackageManager packageManager = getPackageManager();

        String appName = mResolveInfo.loadLabel(packageManager).toString();
@@ -74,8 +76,20 @@ public class UsbConfirmActivity extends AlertActivity 
                    mAccessory.getDescription());

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mAccessory);

        } else {

            ap.mMessage = getString(R.string.usb_device_confirm_prompt, appName,

                    mDevice.getProductName());

            int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);

            boolean hasRecordPermission =

                    PermissionChecker.checkPermissionForPreflight(

                            this, android.Manifest.permission.RECORD_AUDIO, -1, uid,

                            packageName)

                            == android.content.pm.PackageManager.PERMISSION_GRANTED;

            boolean isAudioCaptureDevice = mDevice.getHasAudioCapture();

            boolean useRecordWarning = isAudioCaptureDevice && !hasRecordPermission;



            int strID = useRecordWarning

                    ? R.string.usb_device_confirm_prompt_warn

                    : R.string.usb_device_confirm_prompt;



            ap.mMessage = getString(strID, appName, mDevice.getProductName());

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mDevice);

        }

        ap.mPositiveButtonText = getString(android.R.string.ok);