| commit | 0458fe14d59f38ef6f78201def677899a24dcc96 | [log] [tgz] |
|---|---|---|
| author | Sean.JS Tsai <seanjstsai@google.com> | Tue Oct 31 02:16:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 31 02:16:26 2023 +0000 |
| tree | 941ec1cca74500bf366dd683f129a8d0d80ed6f8 | |
| parent | d3b4340156e2f8b29ea79051e00d025b4d1dfb17 [diff] | |
| parent | 604ec6d36c2496a824655a45c4510191d7bd591d [diff] |
Merge "[ImsServiceEntitlement] remove fake infomraiont of vendor\modem\software version in user agent" into main am: af1bc0e989 am: 604ec6d36c Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/2807757 Change-Id: Ifacd09e66963065f9ca225c514c66c2dc8bdd326 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 @@ 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 @@ 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(); }