Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" am: 74952231 am: 310c1b76

Change-Id: I1094043068575b6b2a77852d12ac341265aaf6df

core/java/com/android/internal/os/PowerProfile.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -393,6 +393,9 @@ public class PowerProfile {
		}

		public int getNumCoresInCpuCluster(int cluster) {
		if (cluster < 0 \|\| cluster >= mCpuClusters.length) {
		return 0; // index out of bound
		}
		return mCpuClusters[cluster].numCpus;
		}