Permalink
Browse files

Fix the defect that auto-start mechanism cause null pointer crash

Change-Id: I4c0900003f372438e197f701a106cde6c5e1cae8
  • Loading branch information...
1 parent 3b21b65 commit 90c8caf6971139e76996adba1c1b0d1b6996e7ae @yu88my yu88my committed Dec 29, 2012
Showing with 10 additions and 10 deletions.
  1. +10 −10 services.jar.out/smali/com/android/server/pm/PackageManagerService.smali
@@ -16016,16 +16016,6 @@
iput v4, v3, Landroid/content/pm/ApplicationInfo;->flags:I
- move-object/from16 v0, p1
-
- iget-object v3, v0, Landroid/content/pm/PackageParser$Package;->applicationInfo:Landroid/content/pm/ApplicationInfo;
-
- move-object/from16 v0, p0
-
- iget-object v4, v0, Lcom/android/server/pm/PackageManagerService;->mSettings:Lcom/android/server/pm/Settings;
-
- invoke-static {v3, v4}, Lcom/android/server/pm/ExtraPackageManagerServices;->blockAutoStartedApp(Landroid/content/pm/ApplicationInfo;Lcom/android/server/pm/Settings;)V
-
move-object/from16 v0, v41
iget-object v3, v0, Lcom/android/server/pm/PackageSettingBase;->origPackage:Lcom/android/server/pm/PackageSettingBase;
@@ -17902,6 +17892,16 @@
:goto_13
move-object/from16 v0, p1
+ iget-object v3, v0, Landroid/content/pm/PackageParser$Package;->applicationInfo:Landroid/content/pm/ApplicationInfo;
+
+ move-object/from16 v0, p0
+
+ iget-object v10, v0, Lcom/android/server/pm/PackageManagerService;->mSettings:Lcom/android/server/pm/Settings;
+
+ invoke-static {v3, v10}, Lcom/android/server/pm/ExtraPackageManagerServices;->blockAutoStartedApp(Landroid/content/pm/ApplicationInfo;Lcom/android/server/pm/Settings;)V
+
+ move-object/from16 v0, p1
+
iget-object v3, v0, Landroid/content/pm/PackageParser$Package;->providers:Ljava/util/ArrayList;
invoke-virtual {v3}, Ljava/util/ArrayList;->size()I

0 comments on commit 90c8caf

Please sign in to comment.