Merge remote-tracking branch 'origin/lineage-19.1' into v1-s (6cde1165) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accounts/AddAccountSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,8 @@ public class AddAccountSettings extends Activity {
		intent.putExtras(addAccountOptions)
		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
		startActivityForResultAsUser(intent, ADD_ACCOUNT_REQUEST, mUserHandle);
		startActivityForResultAsUser(
		new Intent(intent), ADD_ACCOUNT_REQUEST, mUserHandle);
		} else {
		setResult(RESULT_OK);
		if (mPendingIntent != null) {

+7 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ public class NotificationAccessSettings extends EmptyTextSettings {
		private static final String TAG = "NotifAccessSettings";
		private static final String ALLOWED_KEY = "allowed";
		private static final String NOT_ALLOWED_KEY = "not_allowed";
		private static final int MAX_CN_LENGTH = 500;

		private static final ManagedServiceSettings.Config CONFIG =
		new ManagedServiceSettings.Config.Builder()
		@@ -98,6 +99,12 @@ public class NotificationAccessSettings extends EmptyTextSettings {
		.setNoun(CONFIG.noun)
		.setSetting(CONFIG.setting)
		.setTag(CONFIG.tag)
		.setValidator(info -> {
		if (info.getComponentName().flattenToString().length() > MAX_CN_LENGTH) {
		return false;
		}
		return true;
		})
		.build();
		mServiceListing.addCallback(this::updateList);