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

Browse Source
This commit is contained in:
Selim Cinek
2017-02-10 00:06:39 +00:00
committed by Android (Google) Code Review
parent 89085b1593 e0358de1e4
commit fbf2e0fb2c
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; return neededNow;
} }
private void setSimNeedsEmergencyAffordance(boolean simNeedsEmergencyAffordance) { private void setSimNeedsEmergencyAffordance(boolean simNeedsEmergencyAffordance) {
mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance; if (simNeededAffordanceBefore() != simNeedsEmergencyAffordance) {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
EMERGENCY_SIM_INSERTED_SETTING, EMERGENCY_SIM_INSERTED_SETTING,
simNeedsEmergencyAffordance ? 1 : 0); simNeedsEmergencyAffordance ? 1 : 0);
updateEmergencyAffordanceNeeded(); }
if (simNeedsEmergencyAffordance != mSimNeedsEmergencyAffordance) {
mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance;
updateEmergencyAffordanceNeeded();
}
} }
private boolean simNeededAffordanceBefore() { private boolean simNeededAffordanceBefore() {
return Settings.Global.getInt(mContext.getContentResolver(), return Settings.Global.getInt(mContext.getContentResolver(),
"emergency_sim_inserted_before", 0) != 0; EMERGENCY_SIM_INSERTED_SETTING, 0) != 0;
} }
private boolean handleUpdateCellInfo() { private boolean handleUpdateCellInfo() {