Merge "Back up / restore default app and intent filter verification state" into mnc-dev

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
index d7abad0,4b196a0..41d3ffd
--- 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
@@@ -553,9 -552,22 +554,25 @@@ public class PackageManagerService exte
      final SparseArray<IntentFilterVerificationState> mIntentFilterVerificationStates
              = new SparseArray<IntentFilterVerificationState>();
  
 +    final DefaultPermissionGrantPolicy mDefaultPermissionPolicy =
 +            new DefaultPermissionGrantPolicy(this);
 +
+     private static class IFVerificationParams {
+         PackageParser.Package pkg;
+         boolean replacing;
+         int userId;
+         int verifierUid;
+ 
+         public IFVerificationParams(PackageParser.Package _pkg, boolean _replacing,
+                 int _userId, int _verifierUid) {
+             pkg = _pkg;
+             replacing = _replacing;
+             userId = _userId;
+             replacing = _replacing;
+             verifierUid = _verifierUid;
+         }
+     }
+ 
      private interface IntentFilterVerifier<T extends IntentFilter> {
          boolean addOneIntentFilterVerification(int verifierId, int userId, int verificationId,
                                                 T filter, String packageName);

diff --cc services/core/java/com/android/server/pm/Settings.java
Simple merge