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

Commit 6d77b32c authored by Kiran S's avatar Kiran S Committed by Automerger Merge Worker
Browse files

Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c6 

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



Change-Id: Ic3cfaa371b2b9533d9e51fc3f0b7ca0dfcf919c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1c0ac14 2ea770c6

services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java

+21 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server.usb;

package com.android.server.usb;





import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;



import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;

import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;





import android.annotation.NonNull;

import android.annotation.NonNull;
@@ -42,6 +44,7 @@ import android.os.AsyncTask; 
import android.os.Environment;

import android.os.Environment;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.Settings;

import android.service.usb.UsbProfileGroupSettingsManagerProto;

import android.service.usb.UsbProfileGroupSettingsManagerProto;

import android.service.usb.UsbSettingsAccessoryPreferenceProto;

import android.service.usb.UsbSettingsAccessoryPreferenceProto;

import android.service.usb.UsbSettingsDevicePreferenceProto;

import android.service.usb.UsbSettingsDevicePreferenceProto;
@@ -913,10 +916,28 @@ class UsbProfileGroupSettingsManager { 
            return;

            return;

        }

        }





        if (shouldRestrictOverlayActivities()) {

            return;

        }



        // Start activity with registered intent

        // Start activity with registered intent

        resolveActivity(intent, matches, defaultActivity, device, null);

        resolveActivity(intent, matches, defaultActivity, device, null);

    }

    }





    private boolean shouldRestrictOverlayActivities() {

        if (Settings.Secure.getIntForUser(

                mContext.getContentResolver(),

                USER_SETUP_COMPLETE,

                /* defaultValue= */ 1,

                UserHandle.CURRENT.getIdentifier())

                == 0) {

            Slog.d(TAG, "restricting usb overlay activities as setup is not complete");

            return true;

        }



        return false;

    }



    public void deviceAttachedForFixedHandler(UsbDevice device, ComponentName component) {

    public void deviceAttachedForFixedHandler(UsbDevice device, ComponentName component) {

        final Intent intent = createDeviceAttachedIntent(device);

        final Intent intent = createDeviceAttachedIntent(device);