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

Commit cd9a661c authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

Contaminant detection notification 

Bug: 119642987
Bug: 117330206
Bug: 77606903

Test: Manually tested for contaminant notification to show up
Change-Id: If22215df1e6127aa67190f72328fbc32b9477bc2
parent e966a38b

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -3573,6 +3573,15 @@ 
    <string name="adb_active_notification_message">Tap to turn off USB debugging</string>

    <string name="adb_active_notification_message" product="tv">Select to disable USB debugging.</string>



    <!-- Title of notification shown when contaminant is detected on the USB port. [CHAR LIMIT=NONE] -->

    <string name="usb_contaminant_detected_title">Liquid or debris in USB port</string>

    <!-- Message of notification shown when contaminant is detected on the USB port. [CHAR LIMIT=NONE] -->

    <string name="usb_contaminant_detected_message">USB port is automatically disabled. Tap to learn more.</string>

    <!-- Title of notification shown when contaminant is no longer detected on the USB port. [CHAR LIMIT=NONE] -->

    <string name="usb_contaminant_not_detected_title">Safe to use USB port</string>

    <!-- Message of notification shown when contaminant is no longer detected on the USB port. [CHAR LIMIT=NONE] -->

    <string name="usb_contaminant_not_detected_message">Phone no longer detects liquid or debris.</string>



    <!-- Title of notification shown to indicate that bug report is being collected. -->

    <string name="taking_remote_bugreport_notification_title">Taking bug report\u2026</string>

    <!-- Title of notification shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -2103,6 +2103,10 @@ 
  <java-symbol type="string" name="usb_supplying_notification_title" />

  <java-symbol type="string" name="usb_unsupported_audio_accessory_title" />

  <java-symbol type="string" name="usb_unsupported_audio_accessory_message" />

  <java-symbol type="string" name="usb_contaminant_detected_title" />

  <java-symbol type="string" name="usb_contaminant_detected_message" />

  <java-symbol type="string" name="usb_contaminant_not_detected_title" />

  <java-symbol type="string" name="usb_contaminant_not_detected_message" />

  <java-symbol type="string" name="config_UsbDeviceConnectionHandling_component" />

  <java-symbol type="string" name="vpn_text" />

  <java-symbol type="string" name="vpn_text_long" />

proto/src/system_messages.proto

+6 −0
Original line number Diff line number Diff line
@@ -220,6 +220,12 @@ message SystemMessage { 
    // Package: android

    NOTE_NETWORK_SUGGESTION_AVAILABLE = 51;



    // Inform the user that the contaminant is detected on the USB port

    NOTE_USB_CONTAMINANT_DETECTED = 52;



    // Inform that user that the USB port is free of contaminants.

    NOTE_USB_CONTAMINANT_NOT_DETECTED = 53;



    // ADD_NEW_IDS_ABOVE_THIS_LINE

    // Legacy IDs with arbitrary values appear below

    // Legacy IDs existed as stable non-conflicting constants prior to the O release

services/usb/java/com/android/server/usb/UsbPortManager.java

+95 −0
Original line number Diff line number Diff line
@@ -31,8 +31,11 @@ import static com.android.internal.usb.DumpUtils.writePortStatus; 


import android.Manifest;

import android.annotation.NonNull;

import android.app.Notification;

import android.app.NotificationManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.hardware.usb.ParcelableUsbPort;

import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbPort;
@@ -63,6 +66,8 @@ import android.util.Slog; 
import android.util.StatsLog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.dump.DualDumpOutputStream;

import com.android.server.FgThread;
@@ -87,6 +92,7 @@ public class UsbPortManager { 
    private static final String TAG = "UsbPortManager";



    private static final int MSG_UPDATE_PORTS = 1;

    private static final int MSG_SYSTEM_READY = 2;



    // All non-trivial role combinations.

    private static final int COMBO_SOURCE_HOST =
@@ -136,6 +142,14 @@ public class UsbPortManager { 
    // Uploads logs only when the connection status is changes.

    private final HashMap<String, Boolean> mConnected = new HashMap<>();



    private NotificationManager mNotificationManager;



    /**

     * If there currently is a notification about contaminated USB port shown the id of the

     * notification, or 0 if there is none.

     */

    private int mIsPortContaminatedNotificationId;



    public UsbPortManager(Context context) {

        mContext = context;

        try {
@@ -166,8 +180,81 @@ public class UsbPortManager { 
                        "ServiceStart: Failed to query port status", e);

            }

        }

        mHandler.sendEmptyMessage(MSG_SYSTEM_READY);

    }



    private void updateContaminantNotification() {

        PortInfo currentPortInfo = null;

        Resources r = mContext.getResources();



        for (PortInfo portInfo : mPorts.values()) {

            if (portInfo.mUsbPortStatus.getContaminantDetectionStatus()

                    == UsbPortStatus.CONTAMINANT_DETECTION_DETECTED) {

                currentPortInfo = portInfo;

                break;

            }

        }



        if (currentPortInfo != null && mIsPortContaminatedNotificationId

                    != SystemMessage.NOTE_USB_CONTAMINANT_DETECTED) {

            if (mIsPortContaminatedNotificationId

                    == SystemMessage.NOTE_USB_CONTAMINANT_NOT_DETECTED) {

                mNotificationManager.cancelAsUser(null, mIsPortContaminatedNotificationId,

                        UserHandle.ALL);

            }



            mIsPortContaminatedNotificationId = SystemMessage.NOTE_USB_CONTAMINANT_DETECTED;

            int titleRes = com.android.internal.R.string.usb_contaminant_detected_title;

            CharSequence title = r.getText(titleRes);

            String channel = SystemNotificationChannels.ALERTS;

            CharSequence message = r.getText(

                    com.android.internal.R.string.usb_contaminant_detected_message);



            Notification.Builder builder = new Notification.Builder(mContext, channel)

                    .setOngoing(true)

                    .setTicker(title)

                    .setColor(mContext.getColor(

                           com.android.internal.R.color

                           .system_notification_accent_color))

                    .setContentTitle(title)

                    .setContentText(message)

                    .setVisibility(Notification.VISIBILITY_PUBLIC)

                    .setSmallIcon(android.R.drawable.stat_sys_warning)

                    .setStyle(new Notification.BigTextStyle()

                    .bigText(message));

            Notification notification = builder.build();

            mNotificationManager.notifyAsUser(null, mIsPortContaminatedNotificationId, notification,

                    UserHandle.ALL);

        } else if (currentPortInfo == null && mIsPortContaminatedNotificationId

                == SystemMessage.NOTE_USB_CONTAMINANT_DETECTED) {

            mNotificationManager.cancelAsUser(null, mIsPortContaminatedNotificationId,

                    UserHandle.ALL);



            mIsPortContaminatedNotificationId = SystemMessage.NOTE_USB_CONTAMINANT_NOT_DETECTED;

            int titleRes = com.android.internal.R.string.usb_contaminant_not_detected_title;

            CharSequence title = r.getText(titleRes);

            String channel = SystemNotificationChannels.ALERTS;

            CharSequence message = r.getText(

                    com.android.internal.R.string.usb_contaminant_not_detected_message);



            Notification.Builder builder = new Notification.Builder(mContext, channel)

                    .setSmallIcon(com.android.internal.R.drawable.ic_usb_48dp)

                    .setTicker(title)

                    .setColor(mContext.getColor(

                           com.android.internal.R.color

                           .system_notification_accent_color))

                    .setContentTitle(title)

                    .setContentText(message)

                    .setVisibility(Notification.VISIBILITY_PUBLIC)

                    .setStyle(new Notification.BigTextStyle()

                    .bigText(message));

            Notification notification = builder.build();

            mNotificationManager.notifyAsUser(null, mIsPortContaminatedNotificationId, notification,

                    UserHandle.ALL);

        }

    }





    public UsbPort[] getPorts() {

        synchronized (mLock) {

            final int count = mPorts.size();
@@ -824,16 +911,19 @@ public class UsbPortManager { 
    private void handlePortAddedLocked(PortInfo portInfo, IndentingPrintWriter pw) {

        logAndPrint(Log.INFO, pw, "USB port added: " + portInfo);

        sendPortChangedBroadcastLocked(portInfo);

        updateContaminantNotification();

    }



    private void handlePortChangedLocked(PortInfo portInfo, IndentingPrintWriter pw) {

        logAndPrint(Log.INFO, pw, "USB port changed: " + portInfo);

        sendPortChangedBroadcastLocked(portInfo);

        updateContaminantNotification();

    }



    private void handlePortRemovedLocked(PortInfo portInfo, IndentingPrintWriter pw) {

        logAndPrint(Log.INFO, pw, "USB port removed: " + portInfo);

        sendPortChangedBroadcastLocked(portInfo);

        updateContaminantNotification();

    }



    private void sendPortChangedBroadcastLocked(PortInfo portInfo) {
@@ -888,6 +978,11 @@ public class UsbPortManager { 
                    }

                    break;

                }

                case MSG_SYSTEM_READY: {

                    mNotificationManager = (NotificationManager)

                            mContext.getSystemService(Context.NOTIFICATION_SERVICE);

                    break;

                }

            }

        }

    };