b/17209397. NOOP getServiceMap() if we are in the tombstone app.

automerge: 0397e7f

* commit '0397e7fb233bbf76f7ea30ab3e447f74d7c6bcce':
  b/17209397. NOOP getServiceMap() if we are in the tombstone app.
This commit is contained in:
Anthony Lee 2014-11-02 07:12:31 +00:00 committed by android-build-merger
commit 7ef664233b

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();