Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Id24a439e,I87e96fb4

Browse Source 
* changes:
  OMS: fix listener callbacks triggered by changes to target package
  OMS: fix offset-by-one error when setting overlay priority
This commit is contained in:
TreeHugger Robot
2018-01-23 22:48:01 +00:00
committed by Android (Google) Code Review
parent 5dd54fdfb6 b6f19c9860
commit f7a7b3df95
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
View File

@@ -169,8 +169,9 @@ final class OverlayManagerServiceImpl {
}
final PackageInfo targetPackage = mPackageManager.getPackageInfo(packageName, userId);
updateAllOverlaysForTarget(packageName, userId, targetPackage);
mListener.onOverlaysChanged(packageName, userId);
if (updateAllOverlaysForTarget(packageName, userId, targetPackage)) {
mListener.onOverlaysChanged(packageName, userId);
}
}
void onTargetPackageChanged(@NonNull final String packageName, final int userId) {
@@ -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);
}
}
/**

2
services/core/java/com/android/server/om/OverlayManagerSettings.java
View File

@@ -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;
}