diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-03-05 15:01:29 -0800 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2020-03-12 19:26:10 +0000 |
| commit | 12ac3f406fed87cb9cd3a28b9947e7202a2d14bd (patch) | |
| tree | b7717fb053b3307d34706451712072261a6c62d0 /wifi/tests | |
| parent | 83d02a976abfed340bf848f0508a8118939d5008 (diff) | |
Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing
For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish
Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Diffstat (limited to 'wifi/tests')
| -rw-r--r-- | wifi/tests/src/android/net/wifi/WifiScannerTest.java | 4 | ||||
| -rw-r--r-- | wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wifi/tests/src/android/net/wifi/WifiScannerTest.java b/wifi/tests/src/android/net/wifi/WifiScannerTest.java index 0cc76b68a15e..4881200aa2b7 100644 --- a/wifi/tests/src/android/net/wifi/WifiScannerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiScannerTest.java @@ -267,7 +267,7 @@ public class WifiScannerTest { assertNull(messageBundle.getParcelable(WifiScanner.SCAN_PARAMS_WORK_SOURCE_KEY)); assertEquals(mContext.getOpPackageName(), messageBundle.getParcelable(WifiScanner.REQUEST_PACKAGE_NAME_KEY)); - assertEquals(mContext.getFeatureId(), + assertEquals(mContext.getAttributionTag(), messageBundle.getParcelable(WifiScanner.REQUEST_FEATURE_ID_KEY)); } @@ -297,7 +297,7 @@ public class WifiScannerTest { Bundle messageBundle = (Bundle) message.obj; assertEquals(mContext.getOpPackageName(), messageBundle.getParcelable(WifiScanner.REQUEST_PACKAGE_NAME_KEY)); - assertEquals(mContext.getFeatureId(), + assertEquals(mContext.getAttributionTag(), messageBundle.getParcelable(WifiScanner.REQUEST_FEATURE_ID_KEY)); } diff --git a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java index a9dcde07fd72..e6eae416ba78 100644 --- a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java +++ b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java @@ -71,7 +71,7 @@ public class WifiRttManagerTest { mMockLooperExecutor = mMockLooper.getNewExecutor(); when(mockContext.getOpPackageName()).thenReturn(packageName); - when(mockContext.getFeatureId()).thenReturn(featureId); + when(mockContext.getAttributionTag()).thenReturn(featureId); } /** |