Merge "Doze: Only doze as owner." into lmp-dev

packages/SystemUI/AndroidManifest.xml

@@ -338,10 +338,11 @@
             </intent-filter>
         </activity>
 
-        <!-- I dream of notifications -->
+        <!-- Doze with notifications, run in main sysui process for every user  -->
         <service
             android:name=".doze.DozeService"
             android:exported="true"
+            android:singleUser="true"
             android:permission="android.permission.BIND_DREAM_SERVICE" />
     </application>
 </manifest>

packages/SystemUI/src/com/android/systemui/doze/DozeService.java

@@ -87,6 +87,7 @@ public class DozeService extends DreamService {
     protected void dumpOnHandler(FileDescriptor fd, PrintWriter pw, String[] args) {
         super.dumpOnHandler(fd, pw, args);
         pw.print("  mDreaming: "); pw.println(mDreaming);
+        pw.print("  mHost: "); pw.println(mHost);
         pw.print("  mBroadcastReceiverRegistered: "); pw.println(mBroadcastReceiverRegistered);
         pw.print("  mSigMotionSensor: "); pw.println(mSigMotionSensor);
         pw.print("  mPickupSensor:"); pw.println(mPickupSensor);
@@ -107,6 +108,7 @@ public class DozeService extends DreamService {
             final SystemUIApplication app = (SystemUIApplication) getApplication();
             mHost = app.getComponent(Host.class);
         }
+        if (mHost == null) Log.w(TAG, "No doze service host found.");
 
         setWindowless(true);
 

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -3925,6 +3925,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
         private DozeService mCurrentDozeService;
 
+        @Override
+        public String toString() {
+            return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + " mCurrentDozeService="
+                    + mCurrentDozeService + "]";
+        }
+
         public void firePowerSaveChanged(boolean active) {
             for (Callback callback : mCallbacks) {
                 callback.onPowerSaveChanged(active);