ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f

Browse Source 
* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
This commit is contained in:
Anthony Lee 2014-11-02 17:44:13 +00:00 committed by Android Git Automerger
commit 351e982e23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/service/EmailServiceUtils.java
View File

@ -543,6 +543,12 @@ public class EmailServiceUtils {
}
final ImmutableMap.Builder<String, EmailServiceInfo> builder = ImmutableMap.builder();
if (!context.getResources().getBoolean(R.bool.enable_services)) {
// Return an empty map if services have been disabled because this is the Email
// Tombstone app.
sServiceMap = builder.build();
return sServiceMap;
}
try {
final Resources res = context.getResources();