diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-10 09:12:53 -0600 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-10-10 09:12:53 -0600 |
commit | a1612988d93917102229bfcd6fdff574cca192a1 (patch) | |
tree | c24f843a02c5cdfa70dd9f6da55793cdf0597a05 | |
parent | b675fb4abd9f08c86341438c65e5c6b1be33eb13 (diff) | |
parent | aff944dfed0e5d64043d5304a41d751e34ba802a (diff) | |
download | android_packages_apps_Stk-a1612988d93917102229bfcd6fdff574cca192a1.tar.gz android_packages_apps_Stk-a1612988d93917102229bfcd6fdff574cca192a1.tar.bz2 android_packages_apps_Stk-a1612988d93917102229bfcd6fdff574cca192a1.zip |
Merge aff944dfed0e5d64043d5304a41d751e34ba802a on remote branch
Change-Id: I2a036fa5fb76dc70343574205ab36c993b98520c
-rw-r--r-- | res/values-mcc222-mnc01/strings.xml | 34 | ||||
-rw-r--r-- | src/com/android/stk/StkAppService.java | 6 |
2 files changed, 39 insertions, 1 deletions
diff --git a/res/values-mcc222-mnc01/strings.xml b/res/values-mcc222-mnc01/strings.xml new file mode 100644 index 0000000..1d458db --- /dev/null +++ b/res/values-mcc222-mnc01/strings.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources> + <string name="app_name">"Servizi SIM"</string> +</resources> diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 712d747..ff8227a 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -944,8 +944,12 @@ public class StkAppService extends Service implements Runnable { CatLog.d(LOG_TAG, "removeMenu() - Uninstall App"); mStkContext[slotId].mCurrentMenu = null; mStkContext[slotId].mMainCmd = null; + boolean menuState = false; //Check other setup menu state. If all setup menu are removed, uninstall apk. for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) { + if (mStkContext[i].mSetupMenuState == STATE_EXIST) { + menuState = true; + } if (i != slotId && (mStkContext[slotId].mSetupMenuState == STATE_UNKNOWN || mStkContext[slotId].mSetupMenuState == STATE_EXIST)) { @@ -954,7 +958,7 @@ public class StkAppService extends Service implements Runnable { break; } } - if (i == mSimCount) { + if (i == mSimCount && !menuState) { StkAppInstaller.unInstall(mContext); } } else { |