summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean.JS Tsai <seanjstsai@google.com>2023-10-31 01:51:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-31 01:51:38 +0000
commit604ec6d36c2496a824655a45c4510191d7bd591d (patch)
tree941ec1cca74500bf366dd683f129a8d0d80ed6f8
parent4848a02a0e046144b2991ea1795b11a5a4b6094b (diff)
parentaf1bc0e9895e0a395666fabd09eda6b42cc168ba (diff)
downloadImsServiceEntitlement-604ec6d36c2496a824655a45c4510191d7bd591d.tar.gz
Merge "[ImsServiceEntitlement] remove fake infomraiont of vendor\modem\software version in user agent" into main am: af1bc0e989
Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/2807757 Change-Id: I19b8a07ab211fb728a3571ca8fdc7ed5a6c29fc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/imsserviceentitlement/ImsEntitlementApi.java4
-rw-r--r--tests/unittests/src/com/android/imsserviceentitlement/ImsEntitlementApiTest.java3
2 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/imsserviceentitlement/ImsEntitlementApi.java b/src/com/android/imsserviceentitlement/ImsEntitlementApi.java
index 9e089c6..eeb4452 100644
--- a/src/com/android/imsserviceentitlement/ImsEntitlementApi.java
+++ b/src/com/android/imsserviceentitlement/ImsEntitlementApi.java
@@ -113,10 +113,6 @@ public class ImsEntitlementApi {
token -> requestBuilder.setAuthenticationToken(token));
FcmUtils.fetchFcmToken(mContext, mSubId);
requestBuilder.setNotificationToken(FcmTokenStore.getToken(mContext, mSubId));
- // Set fake device info to avoid leaking
- requestBuilder.setTerminalVendor("vendorX");
- requestBuilder.setTerminalModel("modelY");
- requestBuilder.setTerminalSoftwareVersion("versionZ");
requestBuilder.setAcceptContentType(ServiceEntitlementRequest.ACCEPT_CONTENT_TYPE_XML);
if (mNeedsImsProvisioning) {
requestBuilder.setConfigurationVersion(
diff --git a/tests/unittests/src/com/android/imsserviceentitlement/ImsEntitlementApiTest.java b/tests/unittests/src/com/android/imsserviceentitlement/ImsEntitlementApiTest.java
index 217ac7b..3f7a7be 100644
--- a/tests/unittests/src/com/android/imsserviceentitlement/ImsEntitlementApiTest.java
+++ b/tests/unittests/src/com/android/imsserviceentitlement/ImsEntitlementApiTest.java
@@ -313,9 +313,6 @@ public class ImsEntitlementApiTest {
requestBuilder.setAuthenticationToken(token);
}
requestBuilder.setNotificationToken(FcmTokenStore.getToken(mContext, SUB_ID));
- requestBuilder.setTerminalVendor("vendorX");
- requestBuilder.setTerminalModel("modelY");
- requestBuilder.setTerminalSoftwareVersion("versionZ");
requestBuilder.setAcceptContentType(ServiceEntitlementRequest.ACCEPT_CONTENT_TYPE_XML);
return requestBuilder.build();
}