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

Commit f389dc74 authored by Khoa Hong's avatar Khoa Hong Committed by Automerger Merge Worker
Browse files

Merge "Don't show dialog for USB Accessory's information URL if device is not... 

Merge "Don't show dialog for USB Accessory's information URL if device is not yet provisioned." into tm-qpr-dev am: fd59b80a am: e5a4b659 am: 7b66ed94

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20392214



Change-Id: Iadc4484fac2293cf821db2d216357d6042081471
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c4d3a73 7b66ed94

packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity; 
import com.android.systemui.settings.brightness.BrightnessDialog;

import com.android.systemui.settings.brightness.BrightnessDialog;

import com.android.systemui.statusbar.tv.notifications.TvNotificationPanelActivity;

import com.android.systemui.statusbar.tv.notifications.TvNotificationPanelActivity;

import com.android.systemui.tuner.TunerActivity;

import com.android.systemui.tuner.TunerActivity;

import com.android.systemui.usb.UsbAccessoryUriActivity;

import com.android.systemui.usb.UsbConfirmActivity;

import com.android.systemui.usb.UsbConfirmActivity;

import com.android.systemui.usb.UsbDebuggingActivity;

import com.android.systemui.usb.UsbDebuggingActivity;

import com.android.systemui.usb.UsbDebuggingSecondaryUserActivity;

import com.android.systemui.usb.UsbDebuggingSecondaryUserActivity;
@@ -97,6 +98,12 @@ public abstract class DefaultActivityBinder { 
    @ClassKey(UsbConfirmActivity.class)

    @ClassKey(UsbConfirmActivity.class)

    public abstract Activity bindUsbConfirmActivity(UsbConfirmActivity activity);

    public abstract Activity bindUsbConfirmActivity(UsbConfirmActivity activity);





    /** Inject into UsbAccessoryUriActivity. */

    @Binds

    @IntoMap

    @ClassKey(UsbAccessoryUriActivity.class)

    public abstract Activity bindUsbAccessoryUriActivity(UsbAccessoryUriActivity activity);



    /** Inject into CreateUserActivity. */

    /** Inject into CreateUserActivity. */

    @Binds

    @Binds

    @IntoMap

    @IntoMap

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

+20 −3
Original line number Original line Diff line number Diff line
@@ -31,6 +31,9 @@ import android.view.WindowManager; 
import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;

import com.android.internal.app.AlertController;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;



import javax.inject.Inject;





/**

/**

 * If the attached USB accessory has a URL associated with it, and that URL is valid,

 * If the attached USB accessory has a URL associated with it, and that URL is valid,
@@ -46,12 +49,26 @@ public class UsbAccessoryUriActivity extends AlertActivity 
    private UsbAccessory mAccessory;

    private UsbAccessory mAccessory;

    private Uri mUri;

    private Uri mUri;





    private final DeviceProvisionedController mDeviceProvisionedController;



    @Inject

    UsbAccessoryUriActivity(DeviceProvisionedController deviceProvisionedController) {

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override

    @Override

    public void onCreate(Bundle icicle) {

    public void onCreate(Bundle icicle) {

        getWindow().addSystemFlags(

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        super.onCreate(icicle);

        super.onCreate(icicle);





        // Don't show this dialog during Setup Wizard

        if (!mDeviceProvisionedController.isDeviceProvisioned()) {

            Log.e(TAG, "device not provisioned");

            finish();

            return;

        }



        Intent intent = getIntent();

        Intent intent = getIntent();

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

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

        String uriString = intent.getStringExtra("uri");

        String uriString = intent.getStringExtra("uri");