Merge "null check before dereference" into oc-dev

am: df8569787c

Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c
This commit is contained in:
Todd Kennedy
2017-06-26 17:10:14 +00:00
committed by android-build-merger

View File

@@ -20029,7 +20029,7 @@ public class PackageManagerService extends IPackageManager.Stub
// Queue up an async operation since the package deletion may take a little while.
mHandler.post(new Runnable() {
public void run() {
final PackageSetting ps = (PackageSetting) pkg.mExtras;
final PackageSetting ps = pkg == null ? null : (PackageSetting) pkg.mExtras;
boolean doClearData = true;
if (ps != null) {
final boolean targetIsInstantApp =