Daniel Colascione
22202139d5
Merge "Add tests for property reads from unset properties"
...
am: f1e0f2e365
Change-Id: I3ce15e20a6a7ae75e6aa0ec566243cb9e98b8d35
2019-11-25 18:45:23 -08:00
Treehugger Robot
f1e0f2e365
Merge "Add tests for property reads from unset properties"
2019-11-26 02:31:31 +00:00
Meng Wang
c5634216d7
Merge "Expose API isInEmergencySmsMode"
...
am: afb05a64c1
Change-Id: Ifb691669cc59b409490ab951db7f68160203b4d8
2019-11-25 16:20:20 -08:00
Meng Wang
afb05a64c1
Merge "Expose API isInEmergencySmsMode"
2019-11-26 00:13:00 +00:00
Jayachandran Chinnakkannu
3fdb0fbc87
Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)"
...
am: 2f1c32ef23
Change-Id: I1d34b1d5cb8f6b1f25269ee0238d6f4dba33ac50
2019-11-25 15:56:54 -08:00
Meng Wang
3dfc84ef72
Expose API isInEmergencySmsMode
...
Bug: 145161090
Test: cts
Merged-In: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
Change-Id: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
2019-11-25 23:56:28 +00:00
Jayachandran Chinnakkannu
2f1c32ef23
Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)"
2019-11-25 23:42:38 +00:00
Xiangyu/Malcolm Chen
19c52ea987
Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other."
...
am: 0f2c3d963d
Change-Id: I70fe3e46ce42dcb8ad7a344906735d1d55421fc7
2019-11-25 15:00:04 -08:00
Xiangyu/Malcolm Chen
9e63a140d4
Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch"
...
am: de5e074ee7
Change-Id: I235ada1332a154ca900ee778eed9562286cf7118
2019-11-25 14:55:14 -08:00
Xiangyu/Malcolm Chen
62351088ee
Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException"
...
am: e14caf398e
Change-Id: I2d5160d893eb8c47556ba5101503bf3a7aafa195
2019-11-25 14:51:53 -08:00
Xiangyu/Malcolm Chen
0f2c3d963d
Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other."
2019-11-25 22:44:35 +00:00
Xiangyu/Malcolm Chen
de5e074ee7
Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch"
2019-11-25 22:44:12 +00:00
Xiangyu/Malcolm Chen
e14caf398e
Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException"
2019-11-25 22:43:40 +00:00
Jayachandran C
43022eb20a
Remove usage of hidden API TelephonyManager.getLine1Number(int)
...
This CL creats subscription specific telephony manager instance
and then invokes getLine1Number() API.
Bug: 140908357
Test: Build
Change-Id: Ib49098dcf3a0718d498d829765ba7f52d9a1de09
2019-11-25 14:32:24 -08:00
Meng Wang
f0c0d50f49
Merge "Move SmsConstants to telephony/common"
...
am: e34b67f5ca
Change-Id: I35f2a22224bd1998a60a1ff080b3bfce8a3a9bdd
2019-11-25 14:13:33 -08:00
Meng Wang
e34b67f5ca
Merge "Move SmsConstants to telephony/common"
2019-11-25 21:59:10 +00:00
Jayachandran Chinnakkannu
e294de2414
Merge "SmsNumberUtils: Remove usage of the following hidden APIs"
...
am: 6052ca74cd
Change-Id: Ib0ed8f4cff78b5caca69ee01cf00e6a03026a456
2019-11-25 13:48:46 -08:00
Jayachandran Chinnakkannu
6052ca74cd
Merge "SmsNumberUtils: Remove usage of the following hidden APIs"
2019-11-25 21:40:14 +00:00
Mathieu Chartier
b541162122
Merge "Pass runtimeFlags to postForkSystemServer"
...
am: d9bcf56448
Change-Id: Ib37dbd13b9b50c4aa072e90fa010320d0208207d
2019-11-25 13:39:18 -08:00
Mathieu Chartier
d9bcf56448
Merge "Pass runtimeFlags to postForkSystemServer"
2019-11-25 21:33:33 +00:00
Malcolm Chen
a575fdfc31
Merge "Do not consider SIM state for inactive SIM/modem slot."
...
am: 445720a321
Change-Id: I757ddca30fac47b084ed03c48642b558a7f9300e
2019-11-25 13:32:22 -08:00
Mathieu Chartier
742981eca3
Pass runtimeFlags to postForkSystemServer
...
Flags are now required by ART.
(cherry-picked from commit 2cb0a4d860 )
Bug: 139883463
Bug: 144383344
Test: showmap `pid system_server` and verify
Test: atest BootImageProfileTest
Merged-In: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
Change-Id: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
2019-11-25 13:32:02 -08:00
Treehugger Robot
445720a321
Merge "Do not consider SIM state for inactive SIM/modem slot."
2019-11-25 21:22:09 +00:00
Kenny Root
f533214352
Merge "RecoverySystem: do not check if socket is closed"
...
am: 6cc2ca0b82
Change-Id: I308fc54d2d59ede5f98f2576457bba47854344b0
2019-11-25 12:07:45 -08:00
Treehugger Robot
6cc2ca0b82
Merge "RecoverySystem: do not check if socket is closed"
2019-11-25 19:50:36 +00:00
Jayachandran C
2863aa48fe
SmsNumberUtils: Remove usage of the following hidden APIs
...
PhoneConstants.PHONE_TYPE_GSM
PhoneConstants.PHONE_TYPE_CDMA
PhoneNumberUtils.isNanp()
Bug: 140908357
Test: Build
Change-Id: I32a55c06bf69bdd0146f2579326794de0cdb3ec5
2019-11-25 11:30:12 -08:00
Meng Wang
ac59ad3c83
Move SmsConstants to telephony/common
...
So it can be used by modules other than telephony.
Bug: 140908357
Test: make
Change-Id: I7819adbc150df5bd8a05014a9dfa79bd8de425b6
2019-11-25 10:37:30 -08:00
Kenny Root
c6c2619ba2
RecoverySystem: do not check if socket is closed
...
LocalSocket does not support checking whether the socket is closed explicitly.
The write or read functions will still return IOException when the socket is
closed, so just rely on that.
Bug: 145102966
Test: Factory reset from Home->Menu->Settings->System->Advanced->Reset options->Erase all Data
Change-Id: I9094f07c2f709f4a270af06db8f02e72e1d7faf0
2019-11-25 10:26:53 -08:00
Meng Wang
5eda192492
Merge "System API: Context#registerReceiverForAllUsers"
...
am: 9e590914cb
Change-Id: I2d98300ad4958d19e69dcdfda83e9d5df086d43a
2019-11-25 10:07:43 -08:00
Meng Wang
9e590914cb
Merge "System API: Context#registerReceiverForAllUsers"
2019-11-25 17:53:53 +00:00
Daniel Colascione
ed4023a61d
Add tests for property reads from unset properties
...
Test: atest FrameworksCoreSystemPropertiesTests
Bug: 144958550
Change-Id: I33c02013f6fb42c3cd974f76cd593940d4f1705b
2019-11-25 06:33:29 -08:00
Neil Fuller
01d1dd28f1
Merge "Remove dead code from SystemServer"
...
am: 05eeef4188
Change-Id: I910fb0ac35c8de8fd500b3df0253c65b6b201fb4
2019-11-25 06:12:57 -08:00
Chalard Jean
0953bfda75
Merge "[NS A11] Small refactor"
...
am: ed2a3ec9b4
Change-Id: I317e6b99a51ddb0a3e49b08c595eb42f4edad1e9
2019-11-25 06:09:17 -08:00
Paul Hu
e0ddf49e0b
Merge "Fix hasUseBackgroundNetworksPermission issue."
...
am: 85e8fd5a24
Change-Id: I6f378dcbbecb9848d02112b2d33c5a0f2d5c9d1f
2019-11-25 06:05:32 -08:00
Lucas Lin
124bb5c9ff
Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN"
...
am: 82f0c22598
Change-Id: I2df410b6ceb0f9a28ee0f171bb2ff7cadd4cdefb
2019-11-25 05:56:29 -08:00
Neil Fuller
05eeef4188
Merge "Remove dead code from SystemServer"
2019-11-25 13:53:15 +00:00
Roshan Pius
0564779e76
Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"
...
am: 5b57190f08
Change-Id: I73c98d9dcb43f2db1e74f6d431f07ac90ee813e6
2019-11-25 05:50:08 -08:00
Bill Lin
00190cf8a6
Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest"
...
am: 63e6d6af01
Change-Id: I362c1a03a1f8c106f684cd6a28fe63fbd5532d9c
2019-11-25 05:36:35 -08:00
Richard Uhler
5a6df15108
Increase timeout in testNativeWatchdogTriggersRollback
...
am: 5f01cb9246
Change-Id: I4677f053787074ef445bba8d18ace8ad66c711ff
2019-11-25 05:36:26 -08:00
Richard Uhler
79e8fcb4ae
Fix flaky testEnableRollbackTimeoutFailsRollback test
...
am: 1d66bf8c48
Change-Id: Id8c792c9a0926fbd7b8e287c6547eb250caca5fb
2019-11-25 05:36:13 -08:00
Oli Lan
170a519878
Wait for available rollbacks in RollbackTest.
...
am: 77a40731f8
Change-Id: I83b8f07f333e318bb7fd31b2bec3f868b1848c6c
2019-11-25 05:35:57 -08:00
Oli Lan
b63dfa2d3b
Include NewRollbacks in result of getAvailableRollbacks.
...
am: dc4a36105b
Change-Id: I6d45d8a2c408e4d8def25895846d6b7c3bf0de29
2019-11-25 05:35:35 -08:00
Richard Uhler
b646e555e8
Rename RollbackData to Rollback.
...
am: 91fc4db14e
Change-Id: I01d1329b3c49deee6b54ae77100cdaf71c3bbf55
2019-11-25 05:34:58 -08:00
Oli Lan
682e501c2a
Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK.
...
am: 87a504d1fc
Change-Id: I8636d29038d10d3f4182e130de08ad8efa294a8e
2019-11-25 05:34:25 -08:00
Richard Uhler
a39bd708e4
Update to new RollbackUtils.sendCrashBroadcast API.
...
am: 3e7ef5ae0b
Change-Id: I518d37f8d2eef80f63c88530ed4aa581c27b9e75
2019-11-25 05:33:56 -08:00
Gavin Corkery
4bcb79bb71
Extend ROLLBACK_COMMITTED broadcast for the multi-user case
...
am: e92720ddb9
Change-Id: I28bb0d0574c80df5f6d6628bc6026d99770faaf5
2019-11-25 05:33:06 -08:00
Richard Uhler
d0654a76f3
[automerger skipped] Fix NullPointerException.
...
am: b4bad064d8 -s ours
am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history
Change-Id: If77c223bce798c1d09f38f791f8aeca494a33324
2019-11-25 05:25:55 -08:00
Richard Uhler
01178b4f9d
Cleanup some obsolete TODOs and unused code.
...
am: cda1a17516
Change-Id: I56bce126042670678002ddbbfcf14ff9f94860c3
2019-11-25 05:24:46 -08:00
Chalard Jean
ed2a3ec9b4
Merge "[NS A11] Small refactor"
2019-11-25 08:55:19 +00:00
Paul Hu
85e8fd5a24
Merge "Fix hasUseBackgroundNetworksPermission issue."
2019-11-25 08:41:05 +00:00