Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

2014-07-10 00:43:07 +00:00
parent e8e968a7c6 24f06d2440
commit 5430d3a4c9
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2609,6 +2609,10 @@ public final class PowerManagerService extends com.android.server.SystemService

        @Override // Binder call
        public void powerHint(int hintId, int data) {
+            if (!mSystemReady) {
+                // Service not ready yet, so who the heck cares about power hints, bah.
+                return;
+            }
            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
            powerHintInternal(hintId, data);
        }