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

Commit 0608497d authored by George Chan's avatar George Chan
Browse files

Updated UsbDataProtectionHook to account for feature disablement without... 

Updated UsbDataProtectionHook to account for feature disablement without immediate reboot as well as adding fallback default for canSetUsbDataSignal.

Since the feature is init during boot time. Querying APM immediately after disabling the feature before next reboot would cause feature to query the disabled feature anyways. So we need return false when that occurs.

Also there can be APM availability queries by callers that do not have sufficient permission. So instead, we are now caching the value on boot time so no further MANAGE_USB permission is require for future queries.

Test: atest
Bug: 395965739
Flag: android.security.aapm_feature_usb_data_protection
Change-Id: I2f7ec08fb2349d32f185c43efacc8983fbb309f2
parent c1e8d636

services/core/java/com/android/server/security/advancedprotection/features/UsbDataAdvancedProtectionHook.java

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.RemoteException;

import android.os.UserHandle;

import android.security.Flags;

import android.util.Slog;



import com.android.server.LocalServices;
@@ -83,6 +84,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { 
    private NotificationManager mNotificationManager;

    private NotificationChannel mNotificationChannel;



    private boolean mCanSetUsbDataSignal = false;

    private AdvancedProtectionFeature mFeature

        = new AdvancedProtectionFeature(FEATURE_ID_DISALLOW_USB);
@@ -96,6 +98,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { 
        mUsbManagerInternal = Objects.requireNonNull(

            LocalServices.getService(IUsbManagerInternal.class));

        onAdvancedProtectionChanged(enabled);

        mCanSetUsbDataSignal = canSetUsbDataSignal();

    }



    @Override
@@ -105,7 +108,7 @@ public class UsbDataAdvancedProtectionHook extends AdvancedProtectionHook { 


    @Override

    public boolean isAvailable() {

        return canSetUsbDataSignal();

        return Flags.aapmFeatureUsbDataProtection() && mCanSetUsbDataSignal;

    }



    @Override