Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fcac6d authored by Adnan Begovic's avatar Adnan Begovic Committed by Gerrit Code Review
Browse files

fw: Move externalCMServices declaration to external res package. 

Change-Id: I2bf53090a7276ecd2971036ad9ff60993bae5b82
parent f5994c83

core/res/res/values/cm_symbols.xml

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
         frameworks/base/core/res/MakeJavaSymbols.sed for how to easily generate

         this.

    -->

    <!-- External CM specific core services -->

    <java-symbol type="array" name="config_externalCMServices" />



    <java-symbol type="bool" name="config_singleStageCameraKey" />

    <java-symbol type="integer" name="config_longPressOnMenuBehavior" />

    <java-symbol type="integer" name="config_longPressOnAppSwitchBehavior" />

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -2491,9 +2491,6 @@ 
         permanent error -->

    <bool translatable="false" name="config_protocol_errors_perm_failure">true</bool>



    <!-- External CM Services list -->

    <string-array name="config_externalCMServices"></string-array>



    <!-- Timeout in MS for how long you have to long-press the back key to

         kill the foreground app. -->

    <integer name="config_backKillTimeout">2000</integer>

services/java/com/android/server/SystemServer.java

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ public final class SystemServer { 
        boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);

        boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);

        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");

        String[] externalServices = context.getResources()

                .getStringArray(com.android.internal.R.array.config_externalCMServices);

        String[] externalServices = context.getResources().getStringArray(

                org.cyanogenmod.platform.internal.R.array.config_externalCMServices);



        try {

            Slog.i(TAG, "Reading configuration...");