Merge "Treat the intent filter verifier app as foreground" into oc-dev am: 4b26576175

am: 1777b3f5a6

Change-Id: I8fc06443c25f0360cd140e5b3b01c27f66b32416

diff --combined services/core/java/com/android/server/pm/PackageManagerService.java
index a8d492b,b19074d..2dfd857
--- 1/services/core/java/com/android/server/pm/PackageManagerService.java
--- 2/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@@ -955,6 -955,11 +955,11 @@@ public class PackageManagerService exte
              verificationIntent.setComponent(mIntentFilterVerifierComponent);
              verificationIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
  
+             DeviceIdleController.LocalService idleController = getDeviceIdleController();
+             idleController.addPowerSaveTempWhitelistApp(Process.myUid(),
+                     mIntentFilterVerifierComponent.getPackageName(), getVerificationTimeout(),
+                     userId, false, "intent filter verifier");
+ 
              UserHandle user = new UserHandle(userId);
              mContext.sendBroadcastAsUser(verificationIntent, user);
              if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG,
@@@ -13981,7 -13986,8 +13986,8 @@@
      }
  
      /**
-      * Get the verification agent timeout.
+      * Get the verification agent timeout.  Used for both the APK verifier and the
+      * intent filter verifier.
       *
       * @return verification timeout in milliseconds
       */
@@@ -17918,9 -17924,8 +17924,9 @@@
                  }
              }
              if (removedAppId >= 0) {
 -                packageSender.sendPackageBroadcast(Intent.ACTION_UID_REMOVED, null, extras,
 -                        Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, null, null, broadcastUsers);
 +                packageSender.sendPackageBroadcast(Intent.ACTION_UID_REMOVED,
 +                    null, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND,
 +                    null, null, broadcastUsers);
              }
          }
  
@@@ -22389,10 -22394,7 +22395,10 @@@ Slog.v(TAG, ":: stepped forward, applyi
          @Override
          protected void finalize() throws Throwable {
              try {
 -                mCloseGuard.warnIfOpen();
 +                if (mCloseGuard != null) {
 +                    mCloseGuard.warnIfOpen();
 +                }
 +
                  close();
              } finally {
                  super.finalize();