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

Commit 9d6ac996 authored by Rubin Xu's avatar Rubin Xu
Browse files

Do not hold lock when calling into NotificationManager 

Small refactor of DevicePolicyManagerService.setNetworkLoggingActiveInternal
to make it call NotificationManager without holding its lock.

Bug: 192435507
Test: enable network logging, check notification is shown.
Change-Id: Iab009978c472f843000c1b193de571863fc185bb
parent 50ae7cbf

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+23 −7
Original line number Diff line number Diff line
@@ -14913,6 +14913,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    }















    private void setNetworkLoggingActiveInternal(boolean active) {













        final boolean[] shouldSendNotification = new boolean[] {false};















        synchronized (getLockObject()) {















            mInjector.binderWithCleanCallingIdentity(() -> {















                if (active) {









@@ -14929,17 +14930,23 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                                + " service not being available yet.");















                    }















                    maybePauseDeviceWideLoggingLocked();













                    sendNetworkLoggingNotificationLocked();













                    shouldSendNotification[0] = shouldSendNetworkLoggingNotificationLocked();















                } else {















                    if (mNetworkLogger != null && !mNetworkLogger.stopNetworkLogging()) {















                        Slogf.wtf(LOG_TAG, "Network logging could not be stopped due to the logging"















                                + " service not being available yet.");















                    }















                    mNetworkLogger = null;













                    mInjector.getNotificationManager().cancel(SystemMessage.NOTE_NETWORK_LOGGING);















                }















            });















        }













        if (active) {













            if (shouldSendNotification[0]) {













                sendNetworkLoggingNotification();













            }













        } else {













            mInjector.getNotificationManager().cancel(SystemMessage.NOTE_NETWORK_LOGGING);













        }















    }





























    private @UserIdInt int getNetworkLoggingAffectedUser() {










@@ -15097,20 +15104,25 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















    }



























    private void sendNetworkLoggingNotificationLocked() {













    /**













     * Returns whether it's time to post another network logging notification. When returning true,













     * this method has the side-effect of updating the recorded last network logging notification













     * time to now.













     */













    private boolean shouldSendNetworkLoggingNotificationLocked() {















        ensureLocked();















        // Send a network logging notification if the admin is a device owner, not profile owner.















        final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();















        if (deviceOwner == null || !deviceOwner.isNetworkLoggingEnabled) {













            return;













            return false;















        }















        if (deviceOwner.numNetworkLoggingNotifications















                >= ActiveAdmin.DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN) {













            return;













            return false;















        }















        final long now = System.currentTimeMillis();















        if (now - deviceOwner.lastNetworkLoggingNotificationTimeMs < MS_PER_DAY) {













            return;













            return false;















        }















        deviceOwner.numNetworkLoggingNotifications++;















        if (deviceOwner.numNetworkLoggingNotifications









@@ -15119,6 +15131,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        } else {















            deviceOwner.lastNetworkLoggingNotificationTimeMs = now;















        }













        saveSettingsLocked(deviceOwner.getUserHandle().getIdentifier());













        return true;













    }

























    private void sendNetworkLoggingNotification() {















        final PackageManagerInternal pm = mInjector.getPackageManagerInternal();















        final Intent intent = new Intent(DevicePolicyManager.ACTION_SHOW_DEVICE_MONITORING_DIALOG);















        intent.setPackage(pm.getSystemUiServiceComponent().getPackageName());









@@ -15137,7 +15154,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                        .bigText(mContext.getString(R.string.network_logging_notification_text)))















                .build();















        mInjector.getNotificationManager().notify(SystemMessage.NOTE_NETWORK_LOGGING, notification);













        saveSettingsLocked(deviceOwner.getUserHandle().getIdentifier());















    }





























    /**