Merge "PowerManagerService: Account for WorkChains in wakeLockAffectsUser." (f10a9e75) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/PowerManagerService.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ import android.os.Trace;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.WorkSource;
		import android.os.WorkSource.WorkChain;
		import android.provider.Settings;
		import android.provider.Settings.SettingNotFoundException;
		import android.service.dreams.DreamManagerInternal;
		@@ -1976,6 +1977,16 @@ public final class PowerManagerService extends SystemService
		return true;
		}
		}

		final ArrayList<WorkChain> workChains = wakeLock.mWorkSource.getWorkChains();
		if (workChains != null) {
		for (int k = 0; k < workChains.size(); k++) {
		final int uid = workChains.get(k).getAttributionUid();
		if (userId == UserHandle.getUserId(uid)) {
		return true;
		}
		}
		}
		}
		return userId == UserHandle.getUserId(wakeLock.mOwnerUid);
		}