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

Commit 47b5c583 authored by George Chan's avatar George Chan
Browse files

Fixes pending help intent so its only shown for current active user. 

Logs the stats to statsd for notification shown.

Bug: 405983938, 429399703
Test: manual tests, atom tester
Flag: android.security.aapm_feature_usb_data_protection
Change-Id: I341a000eff679fbf75ca161096604388ea07cbb1
parent 9054c59b

services/core/java/com/android/server/security/advancedprotection/AdvancedProtectionService.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class AdvancedProtectionService extends IAdvancedProtectionService.Stub { 
                && mStore.retrieveInt(AAPM_USB_DATA_PROTECTION, AdvancedProtectionStore.ON)

                == AdvancedProtectionStore.ON) {

          try {

            mHooks.add(new UsbDataAdvancedProtectionHook(mContext, enabled));

            mHooks.add(new UsbDataAdvancedProtectionHook(mContext, enabled, this));

          } catch (Exception e) {

            Slog.e(TAG, "Failed to initialize UsbDataAdvancedProtection", e);

          }

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

+169 −155

File changed.

Preview size limit exceeded, changes collapsed.