summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Milovanov <pmilovanov@google.com>2011-03-17 10:33:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-17 10:33:02 -0700
commit65cf7edf420886a79f278efb757fecadb5c130f5 (patch)
treeb6ba78b9409103a5b391e5d5b7086f396ff1ffb0
parent630e6d7d26fea26abcaaa8c4dabe1fda5d817a41 (diff)
parent074903a95b2e48ee6431eb7a586dfa541e08d559 (diff)
downloadframeworks_base-65cf7edf420886a79f278efb757fecadb5c130f5.zip
frameworks_base-65cf7edf420886a79f278efb757fecadb5c130f5.tar.gz
frameworks_base-65cf7edf420886a79f278efb757fecadb5c130f5.tar.bz2
am 074903a9: am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
* commit '074903a95b2e48ee6431eb7a586dfa541e08d559': 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 3aebb5c..7553c2b 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -7058,8 +7058,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;
}