html6405 authored Nov 27, 2020 and Rohit Sekhar committed Sep 01, 2021

Change-Id: I49eba6235f9879971361ea0952878c0288596d60

html6405 authored Nov 27, 2020 and Rohit Sekhar committed Sep 01, 2021

Change-Id: Ia8d64a69030a438985fda4e078e5f944ccdd6f13

Android Security 9.0.0 Release 71 (7449186)

* tag 'android-security-9.0.0_r71':
  DO NOT MERGE

Change-Id: Ie5939f532cda342f0e396341803e86b85d8acb41

Merge cherrypicks of [14947012, 14947430, 14947171, 14947470, 14947471, 14947013, 14947490] into security-aosp-pi-release

Change-Id: If066b134489d5be3c9febd7b95a923dede7202e3

Check READ_PRIVILEGED_PHONE_STATE instead of READ_PHONE_STATE for getAvailableSubscriptionInfoList

Test: Safety net logging
Bug: 185235454

Change-Id: Ideef8793ac3c42ab30ac3004071d6be19e15b5fe
(cherry picked from commit 2d01df99)

Android 9.0.0 release 60

* tag 'android-9.0.0_r60':
  Use FLAG_IMMUTABLE for InstallCarrierAppUtils
  Use FLAG_IMMUTABLE for InboundSmsHandler
  Use FLAG_IMMUTABLE for CarrierServiceStateTracker
  Use FLAG_IMMUTABLE for CarrierKeyDownloadManager
  Use FLAG_IMMUTABLE
  Restrict access to the resolution PendingIntent created by EuiccController to EuiccResolutionUiDispatcherActivity
  Added FLAG_IMMUTABLE flag for security purposes

Change-Id: I9e8b9922311f235380a99667dc3e8f10ce418caf

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: I8ac155bf53e33474e1fcdb2466743a1e05b92399
Merged-In: I8ac155bf53e33474e1fcdb2466743a1e05b92399
(cherry picked from commit 76decc9e)

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: Idc684438d2cd622adee9a1c4d1801e308ee5ead7
Merged-In: Idc684438d2cd622adee9a1c4d1801e308ee5ead7
(cherry picked from commit 0b1bc3c8)

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: Iea9ec6451170e592dc72c035d6eec7b80150ddd4
Merged-In: Iea9ec6451170e592dc72c035d6eec7b80150ddd4
(cherry picked from commit 89763569)

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: I223047644021a647bce72f229998487bee0c007b
Merged-In: I223047644021a647bce72f229998487bee0c007b
(cherry picked from commit 57fc1fb9)

Require that the PendingIntent be immutable so that a malicious app is
 not able to hijack and mutate any of the details.

Test: Android builds
Bug: 155094269
Change-Id: If127b73c975b5b3f004500de7f9baa6a7bc00ce4
Merged-In: If127b73c975b5b3f004500de7f9baa6a7bc00ce4
(cherry picked from commit a2183fe7)

EuiccController to EuiccResolutionUiDispatcherActivity

Bug: 156097472
Bug: 155094269
Fix: 156097472
Test: Local, with jpd@'s PoC app
Change-Id: I76a9eb55d8321ea695594693580be468522e4de8
Merged-In: I76a9eb55d8321ea695594693580be468522e4de8
(cherry picked from commit 0126084d)

Prevent the intent to be altered by the maleware.

Bug: 155094269
Test: Telephony sanity tests

Merged-In: Ice6e438eb437d377f8c5f26891938302fcb0c8d4
Change-Id: Ice6e438eb437d377f8c5f26891938302fcb0c8d4
(cherry picked from commit 21e03356)

The modemTriggeredPollState breaks airplane mode on some devices.
Although the UI shows that airplane mode is activated, the fact is that
the radio remains active and in service. By using regular pollState()
here, service state in sim status shows correctly radio off.

Enable with setting prop:
ro.telephony.ril.config=legacypollstate

Test: Insert SIM card. Put device into airplane mode. Go into
SIM Status and verify that it says "Radio off".

Change-Id: If2ab5b088a13b1a159e01f82fbea1f58a77b64cd

This fixes issues like broken mobile data and no outgoing calls for SIM
cards that return unkown tags (at least F1 has been seen in the wild).

Change-Id: I4fe5ddc7992b1b3bb025f2a5f9e2b3f410d54841

Some phones / SIMs returns data in TLV format as decribed in ETSI TS 102 221 11.1.1
This enables parsing of TLV data if it finds one. This fixes reading of SIM_IO
data like ICCID, MSISDN, etc on affected SIMs.

In CM-12 this is needed for phone to function properly. In CM-12 Multisim support
requires ICCID. If ICCID is not found then user is unable to make any outgoing
calls. User is shown "Call not sent" error.

Change-Id: I0fe20a9ec4cdd6021e7cb614ae578bc1c2c1d1fd
(cherry picked from commit 70a14292)
(cherry picked from commit 64f87575)

 * Old modem sends and applies mccmnc+network type, but new aosp
   telephony uses only digits.
 * Manually cut or append the "+" and strings after that to work around.

Change-Id: I1015e6c0d6afdc0c03d70e9491d49331703eddcc

SubscriptionManager#getActiveSubscriptionInfoList() should return
sorted list by sim slot index then by subscription id, according to
API annotation in JavaDoc.

Issue:
After SIM swap on DSDS device, tabName of slot1 becomes "UNKNOWN" in
MobileNetworkSettings. When updating tabName, slotId is compared
with activeSubscriptionInfo list one by one in ASCENDING order.
But sometimes activeSubscriptionInfoList is NOT sorted.
In this case, slotId will be unmatched and tabName becomes "UNKNOWN".

Test: manual - Check that display name of subscription is shown
correctly in the tab of mobile network settings.
Bug: 111185160

Change-Id: I67ad0578c1202701dbbca6505458cf529f59570b

* aosp/pie-gsi:
  DO NOT MERGE Return MSISDN as Line1 number if carrier config requires it.
  Remove getAllVpnInfo from ConnectivityServiceMock.

Change-Id: I8aa7eb646017a3e0aeccbfbc075bea65f09b2a8d

Merge "Snap for 5622519 from fe4b8179 to pi-platform-release am: 74184945" into pie-gsi

am: 74184945

Change-Id: I093ebb53d33fd43324ab6e038da1a24307682eef

Change-Id: I08ca3238028cec7a1b10883e6938684dc89f2152

Merge "Snap for 5450365 from 4ea01903 to pi-platform-release am: 35dfc2b3" into pie-gsi

am: 35dfc2b3

Change-Id: If38dde20799acdbe8b47e32eff3877b12a8ee9d0

Change-Id: I837a785109be1555a6787f5b04addb3314323eb1

Android 9.0.0 Release 37 (PQ3A.190505.002)

* tag 'android-9.0.0_r37':
  DO NOT MERGE Return MSISDN as Line1 number if carrier config requires it.
  Amend SMS over IMS proto and metrics collection
  Adds metrics for SMS over IMS using ImsService
  Expand onCallHandover logging and add data enabled check.
  Update sharedPreference to false when exits new device provisioning
  Deprecated the resource config_tether_apndata
  Allow override own number as voicemail number for GSM
  Fix ims_reasoninfo_mapping_string_array not working problem
  Add metrics for audio codec during voice calls
  Ensure ACTION_EMERGENCY_CALL_STATE_CHANGED doesn't send on GSM.
  support vzw roaming default on
  Map ImsReasonInfo.CODE_SIP_USER_REJECTED(SIP 603 DECLINE) as DisconnectCause.NORMAL

Change-Id: Ia3ac68b1c77ee45ea2aa689bbdff51b9132a58fa

Based on system property (ro.telephony.mms_data_profile) set at device level

Change-Id: I6b4ba90dfc5272e3e81330d479b9347bebfc177f

Change-Id: I67e73d38f9a93cd4c4884e8e55e22eb6f7bb29bd

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716, 6715859, 6717160, 6717161, 6717162, 6717163, 6716295, 6717141, 6717181, 6717183, 6717184, 6717185, 6714937, 6717028, 6716717, 6716927, 6717200, 6717029, 6717030, 6717031, 6717032, 6717033, 6716928, 6717034, 6717035, 6716929, 6717201, 6716930, 6712377, 6712378, 6716643, 6717164, 6712379] into pi-qpr3-release

Change-Id: Ifd0a46247b40df11c6ccbdc1d5a26031845445f0

Previously getLine1Number() returns MDN for CDMA phone, it will return MSISDN if a carrier config requires it.

Bug: 124524824
Test: atest GsmCdmaPhoneTest
      atest PhoneSubInfoControllerTest

Change-Id: I11b2e79c4a991208d6f3c914c2639e8918c4c5a9
(cherry picked from commit 1b75d80f)

Change-Id: I4fd73cc8d7507231b0b393703c755759695ae8d0

Previously getLine1Number() returns MDN for CDMA phone, it will return MSISDN if a carrier config requires it.

Bug: 124524824
Test: atest GsmCdmaPhoneTest
      atest PhoneSubInfoControllerTest

Change-Id: I11b2e79c4a991208d6f3c914c2639e8918c4c5a9

See http://ag/6580635 for context.

Test: atest FrameworksNetTests
Bug: 126245192
Change-Id: I02aa2d86aca9cef18024b66e3ca6fd2f5bf39f2b
Merged-In: If2ea101c1a69097118dff451fb352ed1d709d4fd

Change-Id: I5caefc09aaa4a470c21311da4db8243d7538bd47

Merge "Snap for 5180536 from e2b71fbd to pi-platform-release am: 867980ed" into pie-gsi

am: 867980ed

Change-Id: I821e85240b27a0dfeec66cb9f2a7a362e3d58576

Change-Id: Ie78e601fec7e945fe3b7a5cf98777c89447e367e