diff options
6 files changed, 28 insertions, 20 deletions
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index db19f7a4ce27..631057013e50 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -118,7 +118,7 @@ public class ZenModeConfig implements Parcelable { public boolean allowEvents = DEFAULT_ALLOW_EVENTS; public int allowCallsFrom = DEFAULT_SOURCE; public int allowMessagesFrom = DEFAULT_SOURCE; - public int user = UserHandle.USER_OWNER; + public int user = UserHandle.USER_SYSTEM; public ZenRule manualRule; public ArrayMap<String, ZenRule> automaticRules = new ArrayMap<>(); diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java index 40956c1c5747..19d853851820 100644 --- a/services/core/java/com/android/server/notification/ConditionProviders.java +++ b/services/core/java/com/android/server/notification/ConditionProviders.java @@ -67,7 +67,7 @@ public class ConditionProviders extends ManagedServices { public void addSystemProvider(SystemConditionProviderService service) { mSystemConditionProviders.add(service); service.attachBase(mContext); - registerService(service.asInterface(), service.getComponent(), UserHandle.USER_OWNER); + registerService(service.asInterface(), service.getComponent(), UserHandle.USER_SYSTEM); } public Iterable<SystemConditionProviderService> getSystemProviders() { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 4351798b1fc1..0c884f1558fa 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -716,7 +716,7 @@ public class NotificationManagerService extends SystemService { final IPackageManager pm = AppGlobals.getPackageManager(); final int enabled = pm.getApplicationEnabledSetting(pkgName, changeUserId != UserHandle.USER_ALL ? changeUserId : - UserHandle.USER_OWNER); + UserHandle.USER_SYSTEM); if (enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED || enabled == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) { cancelNotifications = false; @@ -1420,7 +1420,7 @@ public class NotificationManagerService extends SystemService { if (!r.isSeen()) { if (DBG) Slog.d(TAG, "Marking notification as seen " + keys[i]); mAppUsageStats.reportEvent(r.sbn.getPackageName(), - userId == UserHandle.USER_ALL ? UserHandle.USER_OWNER + userId == UserHandle.USER_ALL ? UserHandle.USER_SYSTEM : userId, UsageEvents.Event.USER_INTERACTION); r.setSeen(); @@ -1701,7 +1701,8 @@ public class NotificationManagerService extends SystemService { @Override public byte[] getBackupPayload(int user) { if (DBG) Slog.d(TAG, "getBackupPayload u=" + user); - if (user != UserHandle.USER_OWNER) { + //TODO: http://b/22388012 + if (user != UserHandle.USER_SYSTEM) { Slog.w(TAG, "getBackupPayload: cannot backup policy for user " + user); return null; } @@ -1723,7 +1724,8 @@ public class NotificationManagerService extends SystemService { Slog.w(TAG, "applyRestore: no payload to restore for user " + user); return; } - if (user != UserHandle.USER_OWNER) { + //TODO: http://b/22388012 + if (user != UserHandle.USER_SYSTEM) { Slog.w(TAG, "applyRestore: cannot restore policy for user " + user); return; } diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index a089518c53b8..66381f5ac09a 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -148,7 +148,8 @@ public class RankingHelper implements RankingConfig { if (!TextUtils.isEmpty(name)) { if (forRestore) { try { - uid = pm.getPackageUid(name, UserHandle.USER_OWNER); + //TODO: http://b/22388012 + uid = pm.getPackageUid(name, UserHandle.USER_SYSTEM); } catch (NameNotFoundException e) { // noop } @@ -213,7 +214,8 @@ public class RankingHelper implements RankingConfig { final int N = mRecords.size(); for (int i = 0; i < N; i++) { final Record r = mRecords.valueAt(i); - if (forBackup && UserHandle.getUserId(r.uid) != UserHandle.USER_OWNER) { + //TODO: http://b/22388012 + if (forBackup && UserHandle.getUserId(r.uid) != UserHandle.USER_SYSTEM) { continue; } out.startTag(null, TAG_PACKAGE); @@ -437,7 +439,8 @@ public class RankingHelper implements RankingConfig { final Record r = mRestoredWithoutUids.get(pkg); if (r != null) { try { - r.uid = pm.getPackageUid(r.pkg, UserHandle.USER_OWNER); + //TODO: http://b/22388012 + r.uid = pm.getPackageUid(r.pkg, UserHandle.USER_SYSTEM); mRestoredWithoutUids.remove(pkg); mRecords.put(recordKey(r.pkg, r.uid), r); updated = true; diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 57d7758fb6aa..edd274bb1000 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -85,7 +85,7 @@ public class ZenModeHelper { private final Metrics mMetrics = new Metrics(); private int mZenMode; - private int mUser = UserHandle.USER_OWNER; + private int mUser = UserHandle.USER_SYSTEM; private ZenModeConfig mConfig; private AudioManagerInternal mAudioManager; private boolean mEffectsSuppressed; @@ -99,7 +99,7 @@ public class ZenModeHelper { appendDefaultScheduleRules(mDefaultConfig); appendDefaultEventRules(mDefaultConfig); mConfig = mDefaultConfig; - mConfigs.put(UserHandle.USER_OWNER, mConfig); + mConfigs.put(UserHandle.USER_SYSTEM, mConfig); mSettingsObserver = new SettingsObserver(mHandler); mSettingsObserver.observe(); mFiltering = new ZenModeFiltering(mContext); @@ -152,7 +152,7 @@ public class ZenModeHelper { } public void onUserSwitched(int user) { - if (mUser == user || user < UserHandle.USER_OWNER) return; + if (mUser == user || user < UserHandle.USER_SYSTEM) return; mUser = user; if (DEBUG) Log.d(TAG, "onUserSwitched u=" + user); ZenModeConfig config = mConfigs.get(user); @@ -165,7 +165,7 @@ public class ZenModeHelper { } public void onUserRemoved(int user) { - if (user < UserHandle.USER_OWNER) return; + if (user < UserHandle.USER_SYSTEM) return; if (DEBUG) Log.d(TAG, "onUserRemoved u=" + user); mConfigs.remove(user); } @@ -265,7 +265,8 @@ public class ZenModeHelper { final ZenModeConfig config = ZenModeConfig.readXml(parser, mConfigMigration); if (config != null) { if (forRestore) { - if (config.user != UserHandle.USER_OWNER) { + //TODO: http://b/22388012 + if (config.user != UserHandle.USER_SYSTEM) { return; } config.manualRule = null; // don't restore the manual rule @@ -285,7 +286,8 @@ public class ZenModeHelper { public void writeXml(XmlSerializer out, boolean forBackup) throws IOException { final int N = mConfigs.size(); for (int i = 0; i < N; i++) { - if (forBackup && mConfigs.keyAt(i) != UserHandle.USER_OWNER) { + //TODO: http://b/22388012 + if (forBackup && mConfigs.keyAt(i) != UserHandle.USER_SYSTEM) { continue; } mConfigs.valueAt(i).writeXml(out); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 051c8154d0f4..a55911609c6d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -6119,7 +6119,7 @@ public class PackageManagerService extends IPackageManager.Stub { } // Give priority to system apps that listen for pre boot complete. Intent intent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED); - ArraySet<String> pkgNames = getPackageNamesForIntent(intent); + ArraySet<String> pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM); for (Iterator<PackageParser.Package> it = pkgs.iterator(); it.hasNext();) { PackageParser.Package pkg = it.next(); if (pkgNames.contains(pkg.packageName)) { @@ -6154,7 +6154,7 @@ public class PackageManagerService extends IPackageManager.Stub { } // Give priority to apps that listen for boot complete. intent = new Intent(Intent.ACTION_BOOT_COMPLETED); - pkgNames = getPackageNamesForIntent(intent); + pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM); for (Iterator<PackageParser.Package> it = pkgs.iterator(); it.hasNext();) { PackageParser.Package pkg = it.next(); if (pkgNames.contains(pkg.packageName)) { @@ -6225,11 +6225,11 @@ public class PackageManagerService extends IPackageManager.Stub { } } - private ArraySet<String> getPackageNamesForIntent(Intent intent) { + private ArraySet<String> getPackageNamesForIntent(Intent intent, int userId) { List<ResolveInfo> ris = null; try { ris = AppGlobals.getPackageManager().queryIntentReceivers( - intent, null, 0, UserHandle.USER_OWNER); + intent, null, 0, userId); } catch (RemoteException e) { } ArraySet<String> pkgNames = new ArraySet<String>(); @@ -11852,8 +11852,9 @@ public class PackageManagerService extends IPackageManager.Stub { String pkgName = pkg.packageName; if (DEBUG_INSTALL) Slog.d(TAG, "installNewPackageLI: " + pkg); + // TODO: b/23350563 final boolean dataDirExists = Environment - .getDataUserPackageDirectory(volumeUuid, UserHandle.USER_OWNER, pkgName).exists(); + .getDataUserPackageDirectory(volumeUuid, UserHandle.USER_SYSTEM, pkgName).exists(); synchronized(mPackages) { if (mSettings.mRenamedPackages.containsKey(pkgName)) { |