From a037ad401e4a78ce22a9ec2dada8ff3593aa8fa4 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Thu, 10 Dec 2015 14:54:10 -0800
Subject: SystemUi: Handle custom and dynamic tiles the same way.

Change-Id: I885a75444f88a8a0e521af55b413770681c55df6
---
 services/usb/java/com/android/server/usb/UsbDeviceManager.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'services/usb/java/com/android/server')

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 {
-- 
cgit v1.1