diff options
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/cm_arrays.xml | 37 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 14 | ||||
| -rw-r--r-- | ril/SamsungU8500RIL.java | 2 |
3 files changed, 1 insertions, 52 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/cm_arrays.xml b/overlay/frameworks/base/core/res/res/values/cm_arrays.xml deleted file mode 100644 index 2558b33..0000000 --- a/overlay/frameworks/base/core/res/res/values/cm_arrays.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - -<!-- Defines the shutdown options shown in the reboot dialog. --> - <array name="shutdown_reboot_options" translatable="false"> - <item>@string/reboot_reboot</item> - <item>@string/reboot_recovery</item> - <item>@string/reboot_download</item> - </array> - - <!-- Do not translate. Defines the shutdown actions passed to the kernel. - The first item should be empty for regular reboot. --> - <string-array name="shutdown_reboot_actions" translatable="false"> - <item></item> - <item>recovery</item> - <item>download</item> - </string-array> - -</resources> diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b15f8a9..c43a87a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,8 +32,6 @@ <!-- If this is true, the screen will fade off. --> <bool name="config_animateScreenLights">false</bool> - <!-- True will enable the electron beam screen-off animation. --> - <bool name="config_screenOffAnimation">true</bool> <!-- Control whether being in the desk dock (and powered) always keeps the screen on. By default it stays on when plugged in to @@ -140,14 +138,6 @@ <!-- The VoiceMail default value is displayed to my own number if it is true --> <bool name="config_telephony_use_own_number_for_voicemail">true</bool> - <!-- LUN file to be used by legacy USB manager. - The existence of this file will be used to determine in the - legacy USB manager should be started. --> - <string name="config_legacyUmsLunFile">/sys/devices/virtual/android_usb/android0/f_mass_storage/lun0/file</string> - - <!-- Device supports LED flashlight --> - <bool name="config_enableTorch">true</bool> - <!-- Boolean to enable stk functionality on Samsung phones --> <bool name="config_samsung_stk">true</bool> @@ -176,10 +166,6 @@ config to 7. --> <integer name="config_deviceHardwareKeys">7</integer> - <!-- Performance profiles --> - <string name="config_perf_profile_prop">sys.perf.profile</string> - <string name="config_perf_profile_default_entry">1</string> - <!-- Package name(s) containing location provider support. These packages can contain services implementing location providers, such as the Geocode Provider, Network Location Provider, and diff --git a/ril/SamsungU8500RIL.java b/ril/SamsungU8500RIL.java index 51a1d2e..6f0878c 100644 --- a/ril/SamsungU8500RIL.java +++ b/ril/SamsungU8500RIL.java @@ -406,7 +406,7 @@ public class SamsungU8500RIL extends RIL implements CommandsInterface { case RIL_REQUEST_ENTER_SIM_PUK2: ret = responseInts(p); break; case RIL_REQUEST_CHANGE_SIM_PIN: ret = responseInts(p); break; case RIL_REQUEST_CHANGE_SIM_PIN2: ret = responseInts(p); break; - case RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE: ret = responseInts(p); break; + case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: ret = responseInts(p); break; case RIL_REQUEST_GET_CURRENT_CALLS: ret = responseCallList(p); break; case RIL_REQUEST_DIAL: ret = responseVoid(p); break; case RIL_REQUEST_GET_IMSI: ret = responseString(p); break; |