summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Milovanov <pmilovanov@google.com>2011-03-17 10:29:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-17 10:29:50 -0700
commit074903a95b2e48ee6431eb7a586dfa541e08d559 (patch)
tree042151a81d924585b4baf981d3b761165ca37d83
parent132b23f84905060163be6a30d718074cd4e1770d (diff)
parenteca7ff02fb6e75d4355565f05abf8f3af51731a0 (diff)
downloadframeworks_base-074903a95b2e48ee6431eb7a586dfa541e08d559.zip
frameworks_base-074903a95b2e48ee6431eb7a586dfa541e08d559.tar.gz
frameworks_base-074903a95b2e48ee6431eb7a586dfa541e08d559.tar.bz2
am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0': PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
-rw-r--r--services/java/com/android/server/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 04f271d..d542673 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -7030,8 +7030,8 @@ class PackageManagerService extends IPackageManager.Stub {
if (pkgSetting.notLaunched) {
if (pkgSetting.installerPackageName != null) {
sendPackageBroadcast(Intent.ACTION_PACKAGE_FIRST_LAUNCH,
- pkgSetting.installerPackageName, null,
- pkgSetting.name, null);
+ pkgSetting.name, null,
+ pkgSetting.installerPackageName, null);
}
pkgSetting.notLaunched = false;
}