commit fd0d814c25fc1d51d5309eddd9dd1db71cb2700e
author Les Lee <lesl@google.com> Wed Nov 03 19:57:54 2021 +0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 13 14:07:34 2021 +0000
tree e6387a74e8890e84e8026a53bd28c64d27b957ef
parent 3bfc7d8558ce184977fec6b830dd423e6bd7abbb

Fix normalize doesn't work on carrier template

From android 12, the subscriberId is being used for different network
types. For instances:
The TYPE_WIFI with subscriberId means that it is a merged wifi network.
The TYPE_CARRIER means that the network associate to specific carrier
network (subscriberId).

So remove the check "isMatchRuleMobile" and only check whether subscriberId
is being used in NetworkTemplate or not.

Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
(cherry picked from commit 46cc261aa90305bdfec668af5d5ed25a27032cda)
Merged-In:I80c9f887cf8b4714716d657da92ed273a532ce27