Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Schedule to write package restrictions." into lmp-mr1-dev

Browse Source
This commit is contained in:
Nicolas Prevot
2014-10-30 10:28:17 +00:00
committed by Android (Google) Code Review
parent e436cb39da ea72c08c14
commit 9710b04f35
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3266,7 +3266,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (DEBUG_PREFERRED) { if (DEBUG_PREFERRED) {
Slog.v(TAG, "Preferred activity bookkeeping changed; writing restrictions"); Slog.v(TAG, "Preferred activity bookkeeping changed; writing restrictions");
} }
mSettings.writePackageRestrictionsLPr(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
} }
} }
@@ -11566,7 +11566,7 @@ public class PackageManagerService extends IPackageManager.Stub {
+ userId + ":"); + userId + ":");
filter.dump(new LogPrinter(Log.INFO, TAG), " "); filter.dump(new LogPrinter(Log.INFO, TAG), " ");
pir.addFilter(new PreferredActivity(filter, match, set, activity, always)); pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
mSettings.writePackageRestrictionsLPr(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
} }
@@ -11682,8 +11682,7 @@ public class PackageManagerService extends IPackageManager.Stub {
int user = UserHandle.getCallingUserId(); int user = UserHandle.getCallingUserId();
if (clearPackagePreferredActivitiesLPw(packageName, user)) { if (clearPackagePreferredActivitiesLPw(packageName, user)) {
mSettings.writePackageRestrictionsLPr(user); scheduleWritePackageRestrictionsLocked(user);
scheduleWriteSettingsLocked();
} }
} }
} }
@@ -11733,8 +11732,7 @@ public class PackageManagerService extends IPackageManager.Stub {
int user = UserHandle.getCallingUserId(); int user = UserHandle.getCallingUserId();
clearPackagePreferredActivitiesLPw(null, user); clearPackagePreferredActivitiesLPw(null, user);
mSettings.readDefaultPreferredAppsLPw(this, user); mSettings.readDefaultPreferredAppsLPw(this, user);
mSettings.writePackageRestrictionsLPr(user); scheduleWritePackageRestrictionsLocked(user);
scheduleWriteSettingsLocked();
} }
} }
@@ -11786,7 +11784,7 @@ public class PackageManagerService extends IPackageManager.Stub {
filter.dump(new LogPrinter(Log.INFO, TAG), " "); filter.dump(new LogPrinter(Log.INFO, TAG), " ");
mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter( mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(
new PersistentPreferredActivity(filter, activity)); new PersistentPreferredActivity(filter, activity));
mSettings.writePackageRestrictionsLPr(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
} }
@@ -11828,7 +11826,7 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
if (changed) { if (changed) {
mSettings.writePackageRestrictionsLPr(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
} }
} }
@@ -11849,7 +11847,7 @@ public class PackageManagerService extends IPackageManager.Stub {
CrossProfileIntentFilter filter = new CrossProfileIntentFilter(intentFilter, CrossProfileIntentFilter filter = new CrossProfileIntentFilter(intentFilter,
ownerPackage, UserHandle.getUserId(callingUid), targetUserId, flags); ownerPackage, UserHandle.getUserId(callingUid), targetUserId, flags);
mSettings.editCrossProfileIntentResolverLPw(sourceUserId).addFilter(filter); mSettings.editCrossProfileIntentResolverLPw(sourceUserId).addFilter(filter);
mSettings.writePackageRestrictionsLPr(sourceUserId); scheduleWritePackageRestrictionsLocked(sourceUserId);
} }
} }
@@ -11873,7 +11871,7 @@ public class PackageManagerService extends IPackageManager.Stub {
resolver.removeFilter(filter); resolver.removeFilter(filter);
} }
} }
mSettings.writePackageRestrictionsLPr(sourceUserId); scheduleWritePackageRestrictionsLocked(sourceUserId);
} }
} }