cmsdk: Mandate profile feature xml's for service implementation.

  The feature xml plays two roles:

      1) To allow sdk interface (constructor) to throw when system
      service is unavailable. This allows for clearer platform
      development debugging.

      2) To allow for simpler disambiguation of what services to
      instrument in a modular environment.

TICKET: CYNGNOS-2288
Change-Id: Id0adcc1eaa4a0512faf25f11057c45dc2ac733e0

2 files changed, 15 insertions, 0 deletions

diff --git a/src/java/cyanogenmod/app/CMContextConstants.java b/src/java/cyanogenmod/app/CMContextConstants.java
index 761ce09..622732d 100644
--- a/src/java/cyanogenmod/app/CMContextConstants.java
+++ b/src/java/cyanogenmod/app/CMContextConstants.java
@@ -133,5 +133,13 @@ public final class CMContextConstants {
          */
         @SdkConstant(SdkConstant.SdkConstantType.FEATURE)
         public static final String STATUSBAR = "org.cyanogenmod.statusbar";
+
+        /**
+         * Feature for {@link PackageManager#getSystemAvailableFeatures} and
+         * {@link PackageManager#hasSystemFeature}: The device includes the cm profiles service
+         * utilized by the cmsdk.
+         */
+        @SdkConstant(SdkConstant.SdkConstantType.FEATURE)
+        public static final String PROFILES = "org.cyanogenmod.profiles";
     }
 }
diff --git a/src/java/cyanogenmod/app/ProfileManager.java b/src/java/cyanogenmod/app/ProfileManager.java
index 499f583..c2470cb 100644
--- a/src/java/cyanogenmod/app/ProfileManager.java
+++ b/src/java/cyanogenmod/app/ProfileManager.java
@@ -221,6 +221,13 @@ public class ProfileManager {
             mContext = context;
         }
         sService = getService();
+
+        if (context.getPackageManager().hasSystemFeature(
+                cyanogenmod.app.CMContextConstants.Features.PROFILES) && sService == null) {
+            throw new RuntimeException("Unable to get ProfileManagerService. The service either" +
+                    " crashed, was not started, or the interface has been called to early in" +
+                    " SystemServer init");
+        }
     }
 
     /**