Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 110988c8 authored by Andy Stadler's avatar Andy Stadler
Browse files

Fix notification/builder defaults 

* Builder wasn't setting mAudioStreamType to its non-zero default
* Clean up warnings (imports, unused variables, overrides)

Bug: 3250299
Change-Id: I019f54a0d6c97e71681d24144e784fa4b4737f7e
parent 88bf6084

core/java/android/app/Notification.java

+6 −10
Original line number Diff line number Diff line
@@ -16,25 +16,19 @@ 


package android.app;



import java.text.NumberFormat;

import java.util.Date;

import com.android.internal.R;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

import android.text.format.DateFormat;

import android.text.format.DateUtils;

import android.util.Slog;

import android.view.View;

import android.widget.RemoteViews;



import com.android.internal.R;

import java.text.NumberFormat;



/**

 * A class that represents how a persistent notification is to be presented to
@@ -46,8 +40,6 @@ import com.android.internal.R; 
 */

public class Notification implements Parcelable

{

    private static final String TAG = "Notification";



    /**

     * Use all default values (where applicable).

     */
@@ -402,6 +394,7 @@ public class Notification implements Parcelable 
        }

    }



    @Override

    public Notification clone() {

        Notification that = new Notification();
@@ -645,7 +638,10 @@ public class Notification implements Parcelable 


        public Builder(Context context) {

            mContext = context;



            // Set defaults to match the defaults of a Notification

            mWhen = System.currentTimeMillis();

            mAudioStreamType = STREAM_DEFAULT;

        }



        public Builder setWhen(long when) {

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

+4 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server;



import com.android.internal.statusbar.StatusBarNotification;

import com.android.server.StatusBarManagerService;



import android.app.ActivityManagerNative;

import android.app.IActivityManager;
@@ -41,12 +40,11 @@ import android.database.ContentObserver; 
import android.hardware.Usb;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Bundle;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.os.Power;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemProperties;
@@ -55,8 +53,8 @@ import android.provider.Settings; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Slog;

import android.util.Log;

import android.util.Slog;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.widget.Toast;
@@ -158,8 +156,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
        final int id;

        final int uid;

        final int initialPid;

        ITransientNotification callback;

        int duration;

        final Notification notification;

        IBinder statusBarKey;
@@ -642,6 +638,7 @@ public class NotificationManagerService extends INotificationManager.Stub 


    // Notifications

    // ============================================================================

    @Deprecated

    public void enqueueNotification(String pkg, int id, Notification notification, int[] idOut)

    {

        enqueueNotificationWithTag(pkg, null /* tag */, id, notification, idOut);
@@ -975,7 +972,7 @@ public class NotificationManagerService extends INotificationManager.Stub 
        }

    }





    @Deprecated

    public void cancelNotification(String pkg, int id) {

        cancelNotificationWithTag(pkg, null /* tag */, id);

    }
@@ -1030,12 +1027,6 @@ public class NotificationManagerService extends INotificationManager.Stub 
        }

    }



    private void updateLights() {

        synchronized (mNotificationList) {

            updateLightsLocked();

        }

    }



    // lock on mNotificationList

    private void updateLightsLocked()

    {