Merge "null check before dereference" into oc-dev am: df8569787c

am: 6939301147

Change-Id: I9867cce02601d139893edef2c2cc6f89da1d74a9
This commit is contained in:
Todd Kennedy
2017-06-26 17:18:43 +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 =