Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1ad873 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Regenerate ApplicationInfo if package suspend state is changed." into... 

Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09cc am: b3e71637
am: d5840769

* commit 'd5840769':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: I8c7bcb654790a1afb275cb8f7d3f56ebbb0bc465
parents 8eb2e9d6 d5840769

core/java/android/content/pm/PackageParser.java

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; 
import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE;

import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.content.pm.ApplicationInfo.FLAG_SUSPENDED;

import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_RESIZEABLE_ACTIVITIES;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
@@ -5288,6 +5289,10 @@ public class PackageParser { 
                return true;

            }

        }

        boolean suspended = (p.applicationInfo.flags & FLAG_SUSPENDED) != 0;

        if (state.suspended != suspended) {

            return true;

        }

        if (!state.installed || state.hidden) {

            return true;

        }