Merge cherrypicks of [19341499, 19491365, 19117572] into tm-d1-release. (4ca38a23) · Commits · e / os / android_frameworks_base

core/java/android/accounts/Account.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.util.Log;

		import com.android.internal.annotations.GuardedBy;

		import java.util.Objects;
		import java.util.Set;

		/**
		@@ -87,12 +86,6 @@ public class Account implements Parcelable {
		if (TextUtils.isEmpty(type)) {
		throw new IllegalArgumentException("the type must not be empty: " + type);
		}
		if (name.length() > 200) {
		throw new IllegalArgumentException("account name is longer than 200 characters");
		}
		if (type.length() > 200) {
		throw new IllegalArgumentException("account type is longer than 200 characters");
		}
		this.name = name;
		this.type = type;
		this.accessId = accessId;

services/core/java/com/android/server/accounts/AccountManagerService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1820,6 +1820,14 @@ public class AccountManagerService
		if (account == null) {
		return false;
		}
		if (account.name != null && account.name.length() > 200) {
		Log.w(TAG, "Account cannot be added - Name longer than 200 chars");
		return false;
		}
		if (account.type != null && account.type.length() > 200) {
		Log.w(TAG, "Account cannot be added - Name longer than 200 chars");
		return false;
		}
		if (!isLocalUnlockedUser(accounts.userId)) {
		Log.w(TAG, "Account " + account.toSafeString() + " cannot be added - user "
		+ accounts.userId + " is locked. callingUid=" + callingUid);
		@@ -2065,6 +2073,10 @@ public class AccountManagerService
		+ ", pid " + Binder.getCallingPid());
		}
		if (accountToRename == null) throw new IllegalArgumentException("account is null");
		if (newName != null && newName.length() > 200) {
		Log.e(TAG, "renameAccount failed - account name longer than 200");
		throw new IllegalArgumentException("account name longer than 200");
		}
		int userId = UserHandle.getCallingUserId();
		if (!isAccountManagedByCaller(accountToRename.type, callingUid, userId)) {
		String msg = String.format(

services/core/java/com/android/server/notification/NotificationManagerService.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -7030,6 +7030,7 @@ public class NotificationManagerService extends SystemService {

		@GuardedBy("mNotificationLock")
		void snoozeLocked(NotificationRecord r) {
		final List<NotificationRecord> recordsToSnooze = new ArrayList<>();
		if (r.getSbn().isGroup()) {
		final List<NotificationRecord> groupNotifications =
		findCurrentAndSnoozedGroupNotificationsLocked(
		@@ -7038,8 +7039,8 @@ public class NotificationManagerService extends SystemService {
		if (r.getNotification().isGroupSummary()) {
		// snooze all children
		for (int i = 0; i < groupNotifications.size(); i++) {
		if (mKey != groupNotifications.get(i).getKey()) {
		snoozeNotificationLocked(groupNotifications.get(i));
		if (!mKey.equals(groupNotifications.get(i).getKey())) {
		recordsToSnooze.add(groupNotifications.get(i));
		}
		}
		} else {
		@@ -7049,8 +7050,8 @@ public class NotificationManagerService extends SystemService {
		if (groupNotifications.size() == 2) {
		// snooze summary and the one child
		for (int i = 0; i < groupNotifications.size(); i++) {
		if (mKey != groupNotifications.get(i).getKey()) {
		snoozeNotificationLocked(groupNotifications.get(i));
		if (!mKey.equals(groupNotifications.get(i).getKey())) {
		recordsToSnooze.add(groupNotifications.get(i));
		}
		}
		}
		@@ -7058,7 +7059,15 @@ public class NotificationManagerService extends SystemService {
		}
		}
		// snooze the notification
		snoozeNotificationLocked(r);
		recordsToSnooze.add(r);

		if (mSnoozeHelper.canSnooze(recordsToSnooze.size())) {
		for (int i = 0; i < recordsToSnooze.size(); i++) {
		snoozeNotificationLocked(recordsToSnooze.get(i));
		}
		} else {
		Log.w(TAG, "Cannot snooze " + r.getKey() + ": too many snoozed notifications");
		}

		}

services/core/java/com/android/server/notification/SnoozeHelper.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ import java.util.Set;
		public class SnoozeHelper {
		public static final int XML_SNOOZED_NOTIFICATION_VERSION = 1;

		static final int CONCURRENT_SNOOZE_LIMIT = 500;

		protected static final String XML_TAG_NAME = "snoozed-notifications";

		private static final String XML_SNOOZED_NOTIFICATION = "notification";
		@@ -135,6 +137,15 @@ public class SnoozeHelper {
		}
		}

		protected boolean canSnooze(int numberToSnooze) {
		synchronized (mLock) {
		if ((mPackages.size() + numberToSnooze) > CONCURRENT_SNOOZE_LIMIT) {
		return false;
		}
		}
		return true;
		}

		@NonNull
		protected Long getSnoozeTimeForUnpostedNotification(int userId, String pkg, String key) {
		Long time = null;

services/core/java/com/android/server/notification/ZenModeHelper.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -330,7 +330,8 @@ public class ZenModeHelper {
		int newRuleInstanceCount = getCurrentInstanceCount(automaticZenRule.getOwner())
		+ getCurrentInstanceCount(automaticZenRule.getConfigurationActivity())
		+ 1;
		if (newRuleInstanceCount > RULE_LIMIT_PER_PACKAGE
		int newPackageRuleCount = getPackageRuleCount(pkg) + 1;
		if (newPackageRuleCount > RULE_LIMIT_PER_PACKAGE
		\|\| (ruleInstanceLimit > 0 && ruleInstanceLimit < newRuleInstanceCount)) {
		throw new IllegalArgumentException("Rule instance limit exceeded");
		}
		@@ -511,6 +512,23 @@ public class ZenModeHelper {
		return count;
		}

		// Equivalent method to getCurrentInstanceCount, but for all rules associated with a specific
		// package rather than a condition provider service or activity.
		private int getPackageRuleCount(String pkg) {
		if (pkg == null) {
		return 0;
		}
		int count = 0;
		synchronized (mConfig) {
		for (ZenRule rule : mConfig.automaticRules.values()) {
		if (pkg.equals(rule.getPkg())) {
		count++;
		}
		}
		}
		return count;
		}

		public boolean canManageAutomaticZenRule(ZenRule rule) {
		final int callingUid = Binder.getCallingUid();
		if (callingUid == 0 \|\| callingUid == Process.SYSTEM_UID) {