Fix a crash in AppInfoBase where appEntry is invalid am: 2c6634a8a9

am: 4a1245e8c1

Change-Id: Ibf609a79a19fca98554b3ec60940163674125af9
This commit is contained in:
Fan Zhang
2017-07-06 20:36:05 +00:00
committed by android-build-merger
2 changed files with 45 additions and 2 deletions

View File

@@ -35,6 +35,7 @@ import android.os.IBinder;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
@@ -291,7 +292,8 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
@Override
public void onReceive(Context context, Intent intent) {
String packageName = intent.getData().getSchemeSpecificPart();
if (!mFinishing && mAppEntry.info.packageName.equals(packageName)) {
if (!mFinishing && (mAppEntry == null || mAppEntry.info == null
|| TextUtils.equals(mAppEntry.info.packageName, packageName))) {
onPackageRemoved();
}
}