commit 52aa9801fe1e3a6f8f28fcd2c8431effdf67e230
author Arthur Hsu <arthurhsu@google.com> Wed Jan 17 19:30:01 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 17 19:30:01 2018 +0000
tree ca3cae089ec608d855f28d074b0b2d66f5af3df6
parent 3fb6ea960f2cfd859c0c8207e5e5a470cb512a28
parent e27e95e7d532c9761aa7ce9254533dcdcb411c8e

Merge "Skip SystemUI check in BluetoothServiceManager if noHome." am: fc3b50e9b6 am: 65d0549fde
am: e27e95e7d5

Change-Id: Ifa668bfd7d1381c2072e21feeaed383e9fbaaa87

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index d9713a5..337406d 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -60,6 +60,7 @@
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Slog;
 
+import com.android.internal.R;
 import com.android.internal.util.DumpUtils;
 import com.android.server.pm.UserRestrictionsUtils;
 
@@ -415,9 +416,14 @@
 
         int systemUiUid = -1;
         try {
-            systemUiUid = mContext.getPackageManager()
-                    .getPackageUidAsUser("com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY,
-                            UserHandle.USER_SYSTEM);
+            // Check if device is configured with no home screen, which implies no SystemUI.
+            boolean noHome = mContext.getResources().getBoolean(R.bool.config_noHomeScreen);
+            if (!noHome) {
+                systemUiUid = mContext.getPackageManager()
+                        .getPackageUidAsUser("com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY,
+                                UserHandle.USER_SYSTEM);
+            }
+            Slog.d(TAG, "Detected SystemUiUid: " + Integer.toString(systemUiUid));
         } catch (PackageManager.NameNotFoundException e) {
             // Some platforms, such as wearables do not have a system ui.
             Slog.w(TAG, "Unable to resolve SystemUI's UID.", e);