Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev am: fbf2e0fb2c

Browse Source 
am: 0fe3d064a3

Change-Id: I3b86cc62c28c8086ed57505581c33d7b578f893d
This commit is contained in:
Selim Cinek
2017-02-10 00:59:45 +00:00
committed by android-build-merger
parent 22542867b4 0fe3d064a3
commit 9df81dc2e1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
View File

@@ -245,23 +245,25 @@ public class EmergencyAffordanceService extends SystemService {
}
}
}
if (neededNow != neededBefore) {
setSimNeedsEmergencyAffordance(neededNow);
}
setSimNeedsEmergencyAffordance(neededNow);
return neededNow;
}
private void setSimNeedsEmergencyAffordance(boolean simNeedsEmergencyAffordance) {
mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance;
Settings.Global.putInt(mContext.getContentResolver(),
EMERGENCY_SIM_INSERTED_SETTING,
simNeedsEmergencyAffordance ? 1 : 0);
updateEmergencyAffordanceNeeded();
if (simNeededAffordanceBefore() != simNeedsEmergencyAffordance) {
Settings.Global.putInt(mContext.getContentResolver(),
EMERGENCY_SIM_INSERTED_SETTING,
simNeedsEmergencyAffordance ? 1 : 0);
}
if (simNeedsEmergencyAffordance != mSimNeedsEmergencyAffordance) {
mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance;
updateEmergencyAffordanceNeeded();
}
}
private boolean simNeededAffordanceBefore() {
return Settings.Global.getInt(mContext.getContentResolver(),
"emergency_sim_inserted_before", 0) != 0;
EMERGENCY_SIM_INSERTED_SETTING, 0) != 0;
}
private boolean handleUpdateCellInfo() {