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

Commit d68e9ab7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix handling usb notification after pr_swap complete" am: b681fec0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984546

Change-Id: I2df61f61b2ce2ff7934286e8e04d572f2042a523
parents 5d27eda9 b681fec0

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

+4 −3
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 


        // current USB state

        private boolean mHostConnected;

        private boolean mUsbAccessoryConnected;

        private boolean mSourcePower;

        private boolean mSinkPower;

        private boolean mConfigured;
@@ -958,10 +959,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                    break;

                case MSG_UPDATE_HOST_STATE:

                    Iterator devices = (Iterator) msg.obj;

                    boolean connected = (msg.arg1 == 1);

                    mUsbAccessoryConnected = (msg.arg1 == 1);



                    if (DEBUG) {

                        Slog.i(TAG, "HOST_STATE connected:" + connected);

                        Slog.i(TAG, "HOST_STATE connected:" + mUsbAccessoryConnected);

                    }



                    mHideUsbNotification = false;
@@ -1215,7 +1216,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
            } else if (mSourcePower) {

                titleRes = com.android.internal.R.string.usb_supplying_notification_title;

                id = SystemMessage.NOTE_USB_SUPPLYING;

            } else if (mHostConnected && mSinkPower && mUsbCharging) {

            } else if (mHostConnected && mSinkPower && (mUsbCharging || mUsbAccessoryConnected)) {

                titleRes = com.android.internal.R.string.usb_charging_notification_title;

                id = SystemMessage.NOTE_USB_CHARGING;

            }