diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-12-10 14:54:10 -0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-12-10 18:23:12 -0800 |
| commit | a037ad401e4a78ce22a9ec2dada8ff3593aa8fa4 (patch) | |
| tree | 492f1c38a048480aba40ecffe1707ca82bf5d0d3 /services/usb | |
| parent | de980ffe5316bbcbb5871bea44209a45e9b5c0f9 (diff) | |
| download | frameworks_base-a037ad401e4a78ce22a9ec2dada8ff3593aa8fa4.zip frameworks_base-a037ad401e4a78ce22a9ec2dada8ff3593aa8fa4.tar.gz frameworks_base-a037ad401e4a78ce22a9ec2dada8ff3593aa8fa4.tar.bz2 | |
SystemUi: Handle custom and dynamic tiles the same way.
Change-Id: I885a75444f88a8a0e521af55b413770681c55df6
Diffstat (limited to 'services/usb')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 19e39e7..7eab808 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -923,11 +923,6 @@ public class UsbDeviceManager { final int userId = UserHandle.myUserId(); long token = Binder.clearCallingIdentity(); try { - if (!QSUtils.isQSTileEnabledForUser( - mContext, QSConstants.DYNAMIC_TILE_ADB, userId)) { - return; - } - final UserHandle user = new UserHandle(userId); final int icon = QSUtils.getDynamicQSTileResIconId(mContext, userId, QSConstants.DYNAMIC_TILE_ADB); @@ -997,9 +992,7 @@ public class UsbDeviceManager { || CMSettings.Secure.getInt(mContext.getContentResolver(), CMSettings.Secure.ADB_NOTIFY, 1) == 1; boolean isActive = notifEnabled && (usbAdbActive || netAdbActive); - final boolean isEnabledForUser = QSUtils.isQSTileEnabledForUser(mContext, - QSConstants.DYNAMIC_TILE_ADB, userId); - boolean enabled = (userId == UserHandle.USER_OWNER) && isEnabledForUser && isActive; + boolean enabled = (userId == UserHandle.USER_OWNER) && isActive; if (enabled) { publishAdbCustomTile(); } else { |