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

Commit 5d318372 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Destroy remote service when CCService dies."

parents 4c2eee46 d2954720

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

+3 −0
Original line number Diff line number Diff line
@@ -427,6 +427,9 @@ final class ContentCapturePerUserService 
    @GuardedBy("mLock")

    public void destroyLocked() {

        if (mMaster.debug) Slog.d(TAG, "destroyLocked()");

        if (mRemoteService != null) {

            mRemoteService.destroy();

        }

        destroySessionsLocked();

    }

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+0 −3
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem 
                oldService.removeSelfFromCacheLocked();

            }

            mServiceNameResolver.setTemporaryService(userId, componentName, durationMs);



            // Must update the service on cache so its initialization code is triggered

            updateCachedServiceLocked(userId);

        }

    }