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

Commit 7b5bebe4 authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Call registerConnectivityModuleHealthListener in platform 

PackageWatchdog is being moved to a CrashRecovery module.
Use registerConnectivityModuleHealthListener from CrashRecoveryHelper to explicitly register for network errors.

Bug: 338468233
Test: TH
Flag: android.crashrecovery.flags.refactor_crashrecovery
Change-Id: I6a72e0c869f886c9e6aa402064a3c5dc6e3f3e2d
parent 176c12e0

services/core/java/com/android/server/PackageWatchdog.java

+3 −1
Original line number Diff line number Diff line
@@ -296,9 +296,11 @@ public class PackageWatchdog { 
                    this::onSyncRequestNotified);

            setPropertyChangedListenerLocked();

            updateConfigs();

            if (!Flags.refactorCrashrecovery()) {

                registerConnectivityModuleHealthListener();

            }

        }

    }



    /**

     * Registers {@code observer} to listen for package failures. Add a new ObserverInternal for

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ import com.android.internal.util.FastPrintWriter; 
import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.MemInfoReader;

import com.android.internal.util.Preconditions;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.AlarmManagerInternal;

import com.android.server.BootReceiver;

import com.android.server.DeviceIdleInternal;
@@ -763,6 +764,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














    final AppErrors mAppErrors;















    final PackageWatchdog mPackageWatchdog;













    final CrashRecoveryHelper mCrashRecoveryHelper;





























    @GuardedBy("mDeliveryGroupPolicyIgnoredActions")















    private final ArraySet<String> mDeliveryGroupPolicyIgnoredActions = new ArraySet();










@@ -2330,6 +2332,8 @@ public class ActivityManagerService extends IActivityManager.Stub













            } else if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {















                if (!refactorCrashrecovery()) {















                    mService.mPackageWatchdog.onPackagesReady();













                } else {













                    mService.mCrashRecoveryHelper.registerConnectivityModuleHealthListener();















                }















                mService.scheduleHomeTimeout();















            }










@@ -2500,6 +2504,7 @@ public class ActivityManagerService extends IActivityManager.Stub













        mUiContext = null;















        mAppErrors = injector.getAppErrors();















        mPackageWatchdog = null;













        mCrashRecoveryHelper = null;















        mAppOpsService = mInjector.getAppOpsService(null /* recentAccessesFile */,















            null /* storageFile */, null /* handler */);















        mBatteryStatsService = mInjector.getBatteryStatsService();










@@ -2582,6 +2587,7 @@ public class ActivityManagerService extends IActivityManager.Stub



























        mServices = new ActiveServices(this);















        mCpHelper = new ContentProviderHelper(this, true);













        mCrashRecoveryHelper = new CrashRecoveryHelper(mUiContext);















        mPackageWatchdog = PackageWatchdog.getInstance(mUiContext);















        mAppErrors = new AppErrors(mUiContext, this, mPackageWatchdog);















        mUidObserverController = new UidObserverController(mUiHandler);