PocketLock: Add config_pocketModeSupported overlay

Change-Id: I6768c9f8cdd40b2a62df3bd9ddfa04022d69ce10

core/res/res/values/custom_config.xml

@@ -221,4 +221,7 @@
     <!-- Defines custom OEM sensor for pocket detection. -->
     <string name="config_pocketJudgeVendorSensorName"></string>
 
+    <!-- Pocket Lock -->
+    <bool name="config_pocketModeSupported">true</bool>
+
 </resources>

core/res/res/values/custom_symbols.xml

@@ -158,5 +158,6 @@
     <java-symbol type="id" name="pocket_hint_message" />
     <java-symbol type="string" name="config_pocketBridgeSysfsInpocket" />
     <java-symbol type="string" name="config_pocketJudgeVendorSensorName" />
+    <java-symbol type="bool" name="config_pocketModeSupported" />
 
 </resources>

services/core/java/com/android/server/pocket/PocketBridgeService.java

@@ -73,6 +73,9 @@ public void onStateChanged(boolean isDeviceInPocket, int reason) {
         }
     };
 
+    // Custom methods
+    private boolean mSupportedByDevice;
+
     public PocketBridgeService(Context context) {
         super(context);
         mContext = context;
@@ -81,9 +84,13 @@ public PocketBridgeService(Context context) {
         mHandler = new PocketBridgeHandler(handlerThread.getLooper());
         mPocketManager = (PocketManager)
                 context.getSystemService(Context.POCKET_SERVICE);
+        mSupportedByDevice = mContext.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_pocketModeSupported);
         mObserver = new PocketBridgeObserver(mHandler);
-        mObserver.onChange(true);
-        mObserver.register();
+        if (mSupportedByDevice){
+            mObserver.onChange(true);
+            mObserver.register();
+        }
     }
 
     @Override
@@ -98,7 +105,7 @@ private void setEnabled(boolean enabled) {
     }
 
     private void update() {
-        if (mPocketManager == null) return;
+        if (!mSupportedByDevice || mPocketManager == null) return;
 
         if (mEnabled) {
             mPocketManager.addCallback(mPocketCallback);

services/core/java/com/android/server/pocket/PocketService.java

@@ -162,6 +162,7 @@ public class PocketService extends SystemService implements IBinder.DeathRecipie
 
     // Custom methods
     private boolean mPocketLockVisible;
+    private boolean mSupportedByDevice;
 
     public PocketService(Context context) {
         super(context);
@@ -181,9 +182,13 @@ public PocketService(Context context) {
             mLightMaxRange = mLightSensor.getMaximumRange();
         }
         mVendorSensor = getSensor(mSensorManager, mVendorPocketSensor);
+        mSupportedByDevice = mContext.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_pocketModeSupported);
         mObserver = new PocketObserver(mHandler);
-        mObserver.onChange(true);
-        mObserver.register();
+        if (mSupportedByDevice){
+            mObserver.onChange(true);
+            mObserver.register();
+        }
     }
 
     private class PocketObserver extends ContentObserver {
@@ -452,6 +457,10 @@ public void onAccuracyChanged(Sensor sensor, int i) { }
     };
 
     private boolean isDeviceInPocket() {
+        if (!mSupportedByDevice){
+            return false;
+        }
+
         if (mVendorSensorState != VENDOR_SENSOR_UNKNOWN) {
             return mVendorSensorState == VENDOR_SENSOR_IN_POCKET;
         }
@@ -464,6 +473,9 @@ private boolean isDeviceInPocket() {
     }
 
     private void setEnabled(boolean enabled) {
+        if (!mSupportedByDevice){
+            return;
+        }
         if (enabled != mEnabled) {
             mEnabled = enabled;
             mHandler.removeCallbacksAndMessages(null);
@@ -472,6 +484,9 @@ private void setEnabled(boolean enabled) {
     }
 
     private void update() {
+        if (!mSupportedByDevice){
+            return;
+        }
         if (!mEnabled || mInteractive) {
             if (mEnabled && isDeviceInPocket()) {
                 // if device is judged to be in pocket while switching
@@ -486,12 +501,18 @@ private void update() {
     }
 
     private void registerSensorListeners() {
+        if (!mSupportedByDevice){
+            return;
+        }
         startListeningForVendorSensor();
         startListeningForProximity();
         startListeningForLight();
     }
 
     private void unregisterSensorListeners() {
+        if (!mSupportedByDevice){
+            return;
+        }
         stopListeningForVendorSensor();
         stopListeningForProximity();
         stopListeningForLight();