Commit Graph

376840 Commits

Author SHA1 Message Date
Chih-hung Hsieh
dd68cf76de Merge "Allow implicit-fallthrough warnings locally." 2018-10-20 00:44:34 +00:00
Treehugger Robot
8f520e6f83 Merge "Fix implicit-fallthrough warnings." 2018-10-20 00:15:20 +00:00
Dan Shi
50242ce28a Merge "Mark 4 tests as FlakyTest" 2018-10-19 22:13:34 +00:00
Dan Shi
2192b50a29 Mark 4 tests as FlakyTest
Until b/113616538 is fixed, a test class without FlakyTest, can be included in
a presubmit test mapping suite unexpectedly. Mark these 3 classes as FlakyTest
for now:
ActivityManagerServiceTest
AssistDataRequesterTest
AppErrorDialogTest

This test becomes unstable and still needs to be fixed before it can run in
presubmit:
TaskPositioningControllerTests

Bug: 117880789
Test: none
Change-Id: I3ed29bcbd30e34d6fd97169ac2913fbf312d4f70
2018-10-19 14:25:36 -07:00
Bill Yi
04d53e2611 Merge "Merge pi-dr1-dev to aosp-master" 2018-10-19 21:19:30 +00:00
Chih-Hung Hsieh
672a4fd863 Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
2018-10-19 14:19:29 -07:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00:00
Treehugger Robot
1868b7eec8 Merge "Remove resources for 4G/LTE/LTE+ icons" 2018-10-19 19:26:20 +00:00
Bill Yi
0b537c73f7 Merge pi-dr1-dev to aosp-master
Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd
2018-10-19 12:20:31 -07:00
Treehugger Robot
2c10a29eaa Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" 2018-10-19 19:19:26 +00:00
Chih-Hung Hsieh
8767a4ede6 Allow implicit-fallthrough warnings locally.
It will be a global error by default.

Test: make checkbuild
Bug: 112564944
Change-Id: Ib23d0cc8b95a3734d5bd28f8c9d967df669cfdf8
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-19 12:13:48 -07:00
Chen Xu
7dd38c2115 Merge "new SystemAPI for setCarrierDataEnabled" 2018-10-19 18:47:27 +00:00
Chen Xu
a18e095754 Merge "Revert "Telephony light grey list clean up for Q"" 2018-10-19 18:36:56 +00:00
Niklas Lindgren
2132595d59 Remove resources for 4G/LTE/LTE+ icons
CarrierConfig values have been added to better support MVNOs.
Remove the legacy resources.

Test: Make sure that marlin builds with the new carrier configs.
Bug: 113309357
Bug: 113309356
Change-Id: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
Merged-In: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
2018-10-19 18:23:44 +00:00
chen xu
b591f9d2dd correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED
keep the value same as master

Bug: 117930373
Test: telephony unit test
Change-Id: I0bad21eeed2b4667fbb781253828b99332103b31
Merged-in: Id170063bfdb1e3325f67e8680231ab4deda7d65d
2018-10-19 18:18:39 +00:00
Chen Xu
bb0689b6d5 Merge "expose some Telephony.Carriers cols system APIs"
am: f2e0f57976

Change-Id: Ifbceb368352aa1f57912b6690f61fe8412e2dc41
2018-10-19 11:13:04 -07:00
Chen Xu
bab59cb9db Revert "Telephony light grey list clean up for Q"
This reverts commit 253bdb7175.

Reason for revert: This CL caused MMS break because Bugle is using the
hidden API in Q's darkgrey list. The proper fix should either come from
Bugle team if their apk moved to Q, or compat team to explore why this
caused issue for app target on P.

Change-Id: Icc6c190cde79c10d9045183c0b80cdf008e95578

Bug: 117899984
2018-10-19 18:05:32 +00:00
Stanley Tng
76439a1665 Merge "Fix missing connection state changes intent for Hearing Aids"
am: 4c7123f8e3

Change-Id: I8fd60c7a9e1458c9d391407cd53c9cd56fb5509d
2018-10-19 10:59:53 -07:00
Chen Xu
f2e0f57976 Merge "expose some Telephony.Carriers cols system APIs" 2018-10-19 17:56:14 +00:00
Youming Ye
130aacd566 Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c
2018-10-19 10:15:55 -07:00
Treehugger Robot
4c7123f8e3 Merge "Fix missing connection state changes intent for Hearing Aids" 2018-10-19 17:09:34 +00:00
SongFerngWang
dd86ea6036 add four new carrier configs for supplementary service precautions.
am: 7e7c7d2abf

Change-Id: If9d738a3c9632410dc913ed08109b975e90b36a2
2018-10-19 10:08:46 -07:00
Youming Ye
c4b647458c Merge changes from topic "cherrypick"
* changes:
  Add CarrierConfig to hide "Network default" option in Caller ID setting
  add four new carrier configs for supplementary service precautions.
2018-10-19 16:33:22 +00:00
Junyu Lai
43d8774f68 Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Junyu Lai
745952eac8 Merge "Add new callback to inform blocking of network on specific uid."
am: f709e754ab

Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd
2018-10-19 09:14:23 -07:00
Junyu Lai
af0de1a2e9 Merge "Add tests for the network blocked status change" 2018-10-19 15:20:48 +00:00
Junyu Lai
f709e754ab Merge "Add new callback to inform blocking of network on specific uid." 2018-10-19 15:20:48 +00:00
Chalard Jean
86ff3f4c7a Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
am: 54677a86d4

Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba
2018-10-19 05:10:55 -07:00
Mike Yu
f9729757f9 Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
2018-10-19 19:52:50 +08:00
Treehugger Robot
54677a86d4 Merge "Fix a bug where Uri can't parse IPv6 literal addresses." 2018-10-19 11:04:29 +00:00
Stanley Tng
3b24d97130 Fix missing connection state changes intent for Hearing Aids
In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem.

Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.
Bug: 116643085

Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
2018-10-19 07:05:41 +00:00
Mathieu Chartier
96cb6d97e1 Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
2018-10-18 23:52:16 -07:00
sqian
26c2c5e50d Merge "Fix current.txt"
am: 2810d0ae3e

Change-Id: I67eca70fe8d4ef7700e547de54be6d03aca492c7
2018-10-18 23:41:46 -07:00
Ajay Panicker
56d37b7c43 Merge "Synchronize on a static final object to lock mDeviceBusy"
am: 34f9a3e9e9

Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a
2018-10-18 23:24:17 -07:00
Chalard Jean
1a1d52ebb4 Fix a bug where Uri can't parse IPv6 literal addresses.
Bug: 25540738
Test: added CTS in aosp change #793137 and ran them
Change-Id: Ibf870b7e87799090fae9ed456286c11990b01461
2018-10-19 11:25:27 +09:00
taiki tsutsumi
187c9943ff Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.

Test: manual - check options in Caller ID setting
Bug: 111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-19 01:12:39 +00:00
Mathieu Chartier
2417859fa5 Merge "Sleep 1s before force stop and use killBackgroundApp" 2018-10-19 01:07:36 +00:00
SongFerngWang
7e7c7d2abf add four new carrier configs for supplementary service precautions.
The carrier configs control the supplementary service precautions for
call forwarding ,call barring ,caller id ,and call waiting .

Bug: 80404623
Test: Build pass

Change-Id: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-18 16:59:49 -07:00
Treehugger Robot
2810d0ae3e Merge "Fix current.txt" 2018-10-18 23:28:17 +00:00
chen xu
3d59fdb70d new SystemAPI for setCarrierDataEnabled
Bug: 116138716
Test: Telephony unit test
Change-Id: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
Merged-in: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
2018-10-18 15:32:48 -07:00
Mathieu Chartier
5615adf824 Sleep 1s before force stop and use killBackgroundApp
Leave a bit of time before force stopping the application. This might
help prevent bad numbers.

Call killbackgroundApp after doing force-stop to make sure nothing is
still running.

Bug: 117094510
Bug: 117888316
Test: atest google/perf/app-startup/third-party-apps/cold-dropcache-stable-test
Change-Id: I47792f99b38edf2c40f61cc3f6817d82e6339d12
2018-10-18 22:03:47 +00:00
Treehugger Robot
34f9a3e9e9 Merge "Synchronize on a static final object to lock mDeviceBusy" 2018-10-18 22:00:49 +00:00
Hall Liu
5bd6b4d570 Merge "Add dynamic support for 4G/LTE/LTE+ icons"
am: 0c9254ee66

Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad
2018-10-18 14:56:21 -07:00
Brad Ebinger
8e5a756f9d Merge "Expose ImsExternalCallState constructor as @SystemApi"
am: 4133a00a10

Change-Id: Ic1245b146735f33ec679a83eb7dd228b4aeb3178
2018-10-18 14:52:24 -07:00
Kyeongkab.Nam
bea3ddf9de Merge "CEC: Make TV try to dispatch the message first"
am: aa3970209e

Change-Id: Ia5ecee02a2424d895f344a7c22f08d50bb076218
2018-10-18 14:41:48 -07:00
Kyeongkab.Nam
add89ebe40 Merge "Change handling logic in SystemAudioAutoInitiationAction"
am: e31990f54c

Change-Id: Ifbc111a3b01448f7eb35c4dc6b7ebb3be3331bfa
2018-10-18 14:38:41 -07:00
David Brazdil
be42ec18df Merge "Add entries to hidden api greylist"
am: 7d044566c6

Change-Id: Id7966477ee57cd3a8d3b02c4772b6a572e3f5f1a
2018-10-18 14:25:12 -07:00
Xiangyu/Malcolm Chen
325b3aea77 Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
am: 1b59a1673a

Change-Id: I15c450d9ca7a71bfbde1ddd602e13473bede06b3
2018-10-18 14:21:29 -07:00
weichinweng
c91b0fdfeb Merge "AudioService: Add Hearing Aid Switch Control"
am: f3b7821fbd

Change-Id: I6abbbc268a8c391e2d400e7a9811ea0e04362bfc
2018-10-18 14:18:06 -07:00
Eric Laurent
2dc797e211 Merge "audio: apply volume upon hearing aid device connection"
am: 7b9184bff4

Change-Id: Id79009433359321de2af226ca741aa912057e593
2018-10-18 14:14:59 -07:00