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

Commit 8b36a9b1 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "If a Disk goes away, remove the notifications that asks the user to format it." into nyc-dev 

am: 75a19a6f

* commit '75a19a6f':
  If a Disk goes away, remove the notifications that asks the user to format it.

Change-Id: Id8ed9cfc7c6d6f2ef9d6338a165db4c2b619720f
parents 4ed2fb8b 75a19a6f

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.usb;



import android.annotation.NonNull;

import android.app.Notification;

import android.app.Notification.Action;

import android.app.NotificationManager;
@@ -97,6 +98,11 @@ public class StorageNotification extends SystemUI { 
        public void onDiskScanned(DiskInfo disk, int volumeCount) {

            onDiskScannedInternal(disk, volumeCount);

        }



        @Override

        public void onDiskDestroyed(DiskInfo disk) {

            onDiskDestroyedInternal(disk);

        }

    };



    private final BroadcastReceiver mSnoozeReceiver = new BroadcastReceiver() {
@@ -238,6 +244,15 @@ public class StorageNotification extends SystemUI { 
        }

    }



    /**

     * Remove all notifications for a disk when it goes away.

     *

     * @param disk The disk that went away.

     */

    private void onDiskDestroyedInternal(@NonNull DiskInfo disk) {

        mNotificationManager.cancelAsUser(disk.getId(), DISK_ID, UserHandle.ALL);

    }



    private void onVolumeStateChangedInternal(VolumeInfo vol) {

        switch (vol.getType()) {

            case VolumeInfo.TYPE_PRIVATE: