diff options
| author | Les Lee <lesl@google.com> | 2021-11-03 19:57:54 +0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-24 23:22:14 +0000 |
| commit | 8347f70f27f5efbaa6eeba72f83c8a4f47dac413 (patch) | |
| tree | c04a920a5231aa7c9e1f830986519767def2197d /tools/aidl/generate_java.cpp | |
| parent | a70c46b8a5ac697c87017f9c3fdebb03d3cc0292 (diff) | |
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
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions