@@ -1136,34 +1136,52 @@ public boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener
11361136
11371137 @ Override
11381138 public Object getCapability (SystemCapabilityType systemCapabilityType ) {
1139- return LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType );
1139+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1140+ return LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType );
1141+ } else {
1142+ return null ;
1143+ }
11401144 }
11411145
11421146 @ Override
11431147 public void getCapability (SystemCapabilityType systemCapabilityType , OnSystemCapabilityListener scListener ) {
1144- LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType ,scListener );
1145-
1148+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1149+ LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType , scListener );
1150+ }
11461151 }
11471152
11481153 @ Override
11491154 public Object getCapability (SystemCapabilityType systemCapabilityType , OnSystemCapabilityListener scListener , boolean forceUpdate ) {
1150- return LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType , scListener , forceUpdate );
1155+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1156+ return LifecycleManager .this .systemCapabilityManager .getCapability (systemCapabilityType , scListener , forceUpdate );
1157+ } else {
1158+ return null ;
1159+ }
11511160 }
11521161
11531162 @ Override
11541163 public boolean isCapabilitySupported (SystemCapabilityType systemCapabilityType ) {
1155- return LifecycleManager .this .systemCapabilityManager .isCapabilitySupported (systemCapabilityType );
1164+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1165+ return LifecycleManager .this .systemCapabilityManager .isCapabilitySupported (systemCapabilityType );
1166+ } else {
1167+ return false ;
1168+ }
11561169 }
11571170
11581171 @ Override
11591172 public void addOnSystemCapabilityListener (SystemCapabilityType systemCapabilityType , OnSystemCapabilityListener listener ) {
1160- LifecycleManager .this .systemCapabilityManager .addOnSystemCapabilityListener (systemCapabilityType ,listener );
1161-
1173+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1174+ LifecycleManager .this .systemCapabilityManager .addOnSystemCapabilityListener (systemCapabilityType , listener );
1175+ }
11621176 }
11631177
11641178 @ Override
11651179 public boolean removeOnSystemCapabilityListener (SystemCapabilityType systemCapabilityType , OnSystemCapabilityListener listener ) {
1166- return LifecycleManager .this .systemCapabilityManager .removeOnSystemCapabilityListener (systemCapabilityType ,listener );
1180+ if (LifecycleManager .this .systemCapabilityManager != null ) {
1181+ return LifecycleManager .this .systemCapabilityManager .removeOnSystemCapabilityListener (systemCapabilityType , listener );
1182+ } else {
1183+ return false ;
1184+ }
11671185 }
11681186
11691187 @ Override
0 commit comments