Merge "Move autogrouping into framework."

core/java/android/app/NotificationChannel.java

@@ -134,11 +134,11 @@ public final class NotificationChannel implements Parcelable {
         this.mLockscreenVisibility = lockscreenVisibility;
     }
 
-    // Modifiable by apps.
+    // Modifiable by apps on channel creation.
 
     /**
      * Sets the ringtone that should be played for notifications posted to this channel if
-     * the notifications don't supply a ringtone.
+     * the notifications don't supply a ringtone. Only modifiable on channel creation.
      */
     public void setDefaultRingtone(Uri defaultRingtone) {
         this.mRingtone = defaultRingtone;
@@ -146,7 +146,7 @@ public final class NotificationChannel implements Parcelable {
 
     /**
      * Sets whether notifications posted to this channel should display notification lights,
-     * on devices that support that feature.
+     * on devices that support that feature. Only modifiable on channel creation.
      */
     public void setLights(boolean lights) {
         this.mLights = lights;
@@ -154,7 +154,7 @@ public final class NotificationChannel implements Parcelable {
 
     /**
      * Sets whether notification posted to this channel should vibrate, even if individual
-     * notifications are marked as having vibration.
+     * notifications are marked as having vibration only modifiable on channel creation.
      */
     public void setVibration(boolean vibration) {
         this.mVibration = vibration;

core/java/android/service/notification/Adjustment.java

@@ -36,9 +36,6 @@ public final class Adjustment implements Parcelable {
     private final Bundle mSignals;
     private final int mUser;
 
-    public static final String GROUP_KEY_OVERRIDE_KEY = "group_key_override";
-    public static final String NEEDS_AUTOGROUPING_KEY = "autogroup_needed";
-
     /**
      * Create a notification adjustment.
      *