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

Commit a658db41 authored by Philip Junker's avatar Philip Junker Committed by Android (Google) Code Review
Browse files

Merge changes I89c4176c,Ib100e117 

* changes:
  Refactor USB permission and confirm dialogs.
  Add TV specific TvUsbConfirmActivity and TvUsbPermissionActivity.
parents 2588cbca 1ecc0394

core/res/res/values-television/config.xml

+14 −1
Original line number Diff line number Diff line
@@ -45,5 +45,18 @@ 


    <!-- Component name of the activity used to inform a user about a sensory being blocked because

     of privacy settings. -->

    <string name="config_sensorUseStartedActivity">com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity</string>

    <string name="config_sensorUseStartedActivity" translatable="false">

        com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity

    </string>



    <!-- Component name of the activity that shows the request for access to a usb device. -->

    <string name="config_usbPermissionActivity" translatable="false">

        com.android.systemui/com.android.systemui.usb.tv.TvUsbPermissionActivity

    </string>



    <!-- Component name of the activity that confirms the activity to start when a usb device is

     plugged in. -->

    <string name="config_usbConfirmActivity" translatable="false">

        com.android.systemui/com.android.systemui.usb.tv.TvUsbConfirmActivity

    </string>

</resources>

packages/SystemUI/AndroidManifest.xml

+20 −0
Original line number Diff line number Diff line
@@ -442,6 +442,26 @@ 
            android:excludeFromRecents="true">

        </activity>



        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.tv.TvUsbConfirmActivity"

                  android:exported="true"

                  android:launchMode="singleTop"

                  android:permission="android.permission.MANAGE_USB"

                  android:theme="@style/BottomSheet"

                  android:finishOnCloseSystemDialogs="true"

                  android:excludeFromRecents="true">

        </activity>



        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.tv.TvUsbPermissionActivity"

                  android:exported="true"

                  android:launchMode="singleTop"

                  android:permission="android.permission.MANAGE_USB"

                  android:theme="@style/BottomSheet"

                  android:finishOnCloseSystemDialogs="true"

                  android:excludeFromRecents="true">

        </activity>



        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbResolverActivity"

            android:exported="true"

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

+25 −159
Original line number Diff line number Diff line
@@ -16,180 +16,46 @@ 


package com.android.systemui.usb;



import android.app.AlertDialog;

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;

import android.hardware.usb.UsbAccessory;

import android.hardware.usb.UsbDevice;

import android.hardware.usb.UsbManager;

import android.os.Bundle;

import android.os.IBinder;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.TextView;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;

import com.android.systemui.R;



public class UsbConfirmActivity extends AlertActivity

        implements DialogInterface.OnClickListener, CheckBox.OnCheckedChangeListener {



    private static final String TAG = "UsbConfirmActivity";



    private CheckBox mAlwaysUse;

    private TextView mClearDefaultHint;

    private UsbDevice mDevice;

    private UsbAccessory mAccessory;

    private ResolveInfo mResolveInfo;

    private boolean mPermissionGranted;

    private UsbDisconnectedReceiver mDisconnectedReceiver;

/**

 * Dialog shown to confirm the package to start when a USB device or accessory is attached and there

 * is only one package that claims to handle this USB device or accessory.

 */

public class UsbConfirmActivity extends UsbDialogActivity {



    @Override

    public void onCreate(Bundle icicle) {

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        super.onCreate(icicle);



        Intent intent = getIntent();

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



        final AlertController.AlertParams ap = mAlertParams;

        ap.mTitle = appName;

    protected void onResume() {

        super.onResume();

        final int strId;

        boolean useRecordWarning = false;

        if (mDevice == null) {

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

                    mAccessory.getDescription());

            mDisconnectedReceiver = new UsbDisconnectedReceiver(this, mAccessory);

        } else {

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

            useRecordWarning = isAudioCaptureDevice && !hasRecordPermission;



            int strID = useRecordWarning

        if (mDialogHelper.isUsbDevice()) {

            useRecordWarning = mDialogHelper.deviceHasAudioCapture()

                    && !mDialogHelper.packageHasAudioRecordingPermission();

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

        ap.mNegativeButtonText = getString(android.R.string.cancel);

        ap.mPositiveButtonListener = this;

        ap.mNegativeButtonListener = this;



        // add "always use" checkbox

        if (!useRecordWarning) {

            LayoutInflater inflater = (LayoutInflater) getSystemService(

                    Context.LAYOUT_INFLATER_SERVICE);

            ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);

            mAlwaysUse = (CheckBox) ap.mView.findViewById(com.android.internal.R.id.alwaysUse);

            if (mDevice == null) {

                mAlwaysUse.setText(getString(R.string.always_use_accessory, appName,

                        mAccessory.getDescription()));

        } else {

                mAlwaysUse.setText(getString(R.string.always_use_device, appName,

                        mDevice.getProductName()));

            // UsbAccessory case

            strId = R.string.usb_accessory_confirm_prompt;

        }

            mAlwaysUse.setOnCheckedChangeListener(this);

            mClearDefaultHint = (TextView) ap.mView.findViewById(

                    com.android.internal.R.id.clearDefaultHint);

            mClearDefaultHint.setVisibility(View.GONE);

        setAlertParams(strId);

        // Only show the "always use" checkbox if there is no USB/Record warning

        if (!useRecordWarning) {

            addAlwaysUseCheckbox();

        }

        setupAlert();



    }



    @Override

    protected void onDestroy() {

        if (mDisconnectedReceiver != null) {

            unregisterReceiver(mDisconnectedReceiver);

        }

        super.onDestroy();

    }



    public void onClick(DialogInterface dialog, int which) {

        if (which == AlertDialog.BUTTON_POSITIVE) {

            try {

                IBinder b = ServiceManager.getService(USB_SERVICE);

                IUsbManager service = IUsbManager.Stub.asInterface(b);

                final int uid = mResolveInfo.activityInfo.applicationInfo.uid;

                final int userId = UserHandle.myUserId();

                boolean alwaysUse = mAlwaysUse != null ? mAlwaysUse.isChecked() : false;

                Intent intent = null;



                if (mDevice != null) {

                    intent = new Intent(UsbManager.ACTION_USB_DEVICE_ATTACHED);

                    intent.putExtra(UsbManager.EXTRA_DEVICE, mDevice);



                    // grant permission for the device

                    service.grantDevicePermission(mDevice, uid);

                    // set or clear default setting

                    if (alwaysUse) {

                        service.setDevicePackage(

                                mDevice, mResolveInfo.activityInfo.packageName, userId);

    void onConfirm() {

        mDialogHelper.grantUidAccessPermission();

        if (isAlwaysUseChecked()) {

            mDialogHelper.setDefaultPackage();

        } else {

                        service.setDevicePackage(mDevice, null, userId);

                    }

                } else if (mAccessory != null) {

                    intent = new Intent(UsbManager.ACTION_USB_ACCESSORY_ATTACHED);

                    intent.putExtra(UsbManager.EXTRA_ACCESSORY, mAccessory);



                    // grant permission for the accessory

                    service.grantAccessoryPermission(mAccessory, uid);

                    // set or clear default setting

                    if (alwaysUse) {

                        service.setAccessoryPackage(

                                mAccessory, mResolveInfo.activityInfo.packageName, userId);

                    } else {

                        service.setAccessoryPackage(mAccessory, null, userId);

                    }

                }



                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                intent.setComponent(

                    new ComponentName(mResolveInfo.activityInfo.packageName,

                            mResolveInfo.activityInfo.name));

                startActivityAsUser(intent, new UserHandle(userId));

            } catch (Exception e) {

                Log.e(TAG, "Unable to start activity", e);

            }

            mDialogHelper.clearDefaultPackage();

        }

        mDialogHelper.confirmDialogStartActivity();

        finish();

    }



    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

        if (mClearDefaultHint == null) return;



        if(isChecked) {

            mClearDefaultHint.setVisibility(View.VISIBLE);

        } else {

            mClearDefaultHint.setVisibility(View.GONE);

        }

    }

}

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

0 → 100644
+127 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.usb;



import android.app.AlertDialog;

import android.content.DialogInterface;

import android.os.Bundle;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.WindowManager;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.TextView;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;

import com.android.systemui.R;



abstract class UsbDialogActivity extends AlertActivity

        implements DialogInterface.OnClickListener, CheckBox.OnCheckedChangeListener {



    private static final String TAG = UsbDialogActivity.class.getSimpleName();



    UsbDialogHelper mDialogHelper;

    private CheckBox mAlwaysUse;

    private TextView mClearDefaultHint;



    @Override

    protected final void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        try {

            mDialogHelper = new UsbDialogHelper(getApplicationContext(), getIntent());

        } catch (IllegalStateException e) {

            Log.e(TAG, "unable to initialize", e);

            finish();

        }

    }



    @Override

    protected void onResume() {

        super.onResume();

        mDialogHelper.registerUsbDisconnectedReceiver(this);

    }



    @Override

    protected void onPause() {

        if (mDialogHelper != null) {

            mDialogHelper.unregisterUsbDisconnectedReceiver(this);

        }

        super.onPause();

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {

        if (which == AlertDialog.BUTTON_POSITIVE) {

            onConfirm();

        } else {

            finish();

        }

    }



    @Override

    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

        if (mClearDefaultHint == null) return;



        if (isChecked) {

            mClearDefaultHint.setVisibility(View.VISIBLE);

        } else {

            mClearDefaultHint.setVisibility(View.GONE);

        }

    }



    void setAlertParams(int strId) {

        final AlertController.AlertParams ap = mAlertParams;

        ap.mTitle = mDialogHelper.getAppName();

        ap.mMessage = getString(strId, mDialogHelper.getAppName(),

                mDialogHelper.getDeviceDescription());

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

        ap.mNegativeButtonText = getString(android.R.string.cancel);

        ap.mPositiveButtonListener = this;

        ap.mNegativeButtonListener = this;

    }



    void addAlwaysUseCheckbox() {

        final AlertController.AlertParams ap = mAlertParams;

        LayoutInflater inflater = getSystemService(LayoutInflater.class);

        ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);

        mAlwaysUse = ap.mView.findViewById(com.android.internal.R.id.alwaysUse);

        if (mDialogHelper.isUsbAccessory()) {

            mAlwaysUse.setText(getString(R.string.always_use_accessory, mDialogHelper.getAppName(),

                    mDialogHelper.getDeviceDescription()));

        } else {

            // UsbDevice case

            mAlwaysUse.setText(getString(R.string.always_use_device, mDialogHelper.getAppName(),

                    mDialogHelper.getDeviceDescription()));

        }

        mAlwaysUse.setOnCheckedChangeListener(this);

        mClearDefaultHint = ap.mView.findViewById(com.android.internal.R.id.clearDefaultHint);

        mClearDefaultHint.setVisibility(View.GONE);

    }



    boolean isAlwaysUseChecked() {

        return mAlwaysUse != null && mAlwaysUse.isChecked();

    }



    /**

     * Called when the dialog is confirmed.

     */

    abstract void onConfirm();

}

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

0 → 100644
+299 −0

File added.

Preview size limit exceeded, changes collapsed.