tree 2cb7f23ebbb026b4f47d49573cc06da98c902129
parent d529b061a719c4c31de98060ba29d37fc8796717
author Les Lee <lesl@google.com> 1622860872 +0800
committer Les Lee <lesl@google.com> 1622862873 +0000

Usage Settings: Fix NPE when subscriberId is Null.

For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

But new API: buildTemplateCarrierMetered requires non-null subscriberId.
Call old API: buildTemplateMobileAll when subscriberId is NULL since
the matched result is always empty when subscriberId is NULL. No any different
between buildTemplateCarrierMetered and buildTemplateMobileAll.

Bug: 190233044
Bug: 190135429
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Change-Id: I3c7166e60e32142d5995d41722955dd54c21938f