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

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

Merge changes Id24a439e,I87e96fb4 

* changes:
  OMS: fix listener callbacks triggered by changes to target package
  OMS: fix offset-by-one error when setting overlay priority
parents 5dd54fdf b6f19c98

services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

+6 −3
Original line number Diff line number Diff line
@@ -169,9 +169,10 @@ final class OverlayManagerServiceImpl { 
        }



        final PackageInfo targetPackage = mPackageManager.getPackageInfo(packageName, userId);

        updateAllOverlaysForTarget(packageName, userId, targetPackage);

        if (updateAllOverlaysForTarget(packageName, userId, targetPackage)) {

            mListener.onOverlaysChanged(packageName, userId);

        }

    }



    void onTargetPackageChanged(@NonNull final String packageName, final int userId) {

        if (DEBUG) {
@@ -210,7 +211,9 @@ final class OverlayManagerServiceImpl { 
            Slog.d(TAG, "onTargetPackageRemoved packageName=" + packageName + " userId=" + userId);

        }



        updateAllOverlaysForTarget(packageName, userId, null);

        if (updateAllOverlaysForTarget(packageName, userId, null)) {

            mListener.onOverlaysChanged(packageName, userId);

        }

    }



    /**

services/core/java/com/android/server/om/OverlayManagerSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ final class OverlayManagerSettings { 
        }



        mItems.remove(moveIdx);

        final int newParentIdx = select(newParentPackageName, userId);

        final int newParentIdx = select(newParentPackageName, userId) + 1;

        mItems.add(newParentIdx, itemToMove);

        return moveIdx != newParentIdx;

    }