Commit Graph

385896 Commits

Author SHA1 Message Date
Luke Huang
3f2aa4190d Merge "Fix race condition caused by fd reused for DnsResolver" 2019-06-11 15:32:17 +00:00
Luke Huang
5b31126c9d Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410
2019-06-11 15:18:28 +08:00
Treehugger Robot
882558700b Merge "Add FrameworksNetDeflakeTest" 2019-06-11 05:40:44 +00:00
Treehugger Robot
8402337237 Merge "Add workaround for b/124210145" 2019-06-11 03:25:45 +00:00
Xin Li
3d478475d6 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:58 +00:00
Neil Fuller
1c5515c76a Merge "Switch to use tz data module tz files, not runtime module" 2019-06-10 17:21:51 +00:00
The Android Open Source Project
c0ff987df5 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug: 134605042
Change-Id: Ifb8de28ea860cec31308c8472c26766a6461aa5d
2019-06-10 09:32:28 -07:00
Roland Levillain
244f224221 Merge "Use suffixes instead of stems in the definition of module app_process."
am: 9c2eef9841

Change-Id: I121b48ca7c657bc524bc9c4bcf250a675f027e3a
2019-06-10 05:13:29 -07:00
Roland Levillain
9c2eef9841 Merge "Use suffixes instead of stems in the definition of module app_process." 2019-06-10 11:51:27 +00:00
Neil Fuller
54db13fa62 Switch to use tz data module tz files, not runtime module
The time zone data module is now functionally mandatory so
we can reference the files there instead.

Bug:132168458
Test: build only
Change-Id: Ie246be6882a128beddd1d9d4ee1c9bc02a821755
2019-06-10 11:00:24 +00:00
SongFerngWang
ffe3ce0ce3 Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState."
am: 74cdfecc5d

Change-Id: I42a294404ae715f998f3b0db90e79602629ef9dc
2019-06-09 23:20:16 -07:00
Treehugger Robot
74cdfecc5d Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState." 2019-06-10 06:04:15 +00:00
SongFerngWang
dfa9a7464b notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState.
It is wrong array. The correct array is mUserMobileDataState.

Bug: 128510330
Test: build pass
Merged-In: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
Change-Id: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
2019-06-10 10:22:25 +08:00
Remi NGUYEN VAN
67e55b4b70 Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4
am: 870c267b6c

Change-Id: I1df4d64ef2c56a1f8f7fb6b5dfd6de1eab2e157b
2019-06-09 18:33:16 -07:00
Remi NGUYEN VAN
870c267b6c Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4
* changes:
  Remove DeviceConfig usage from NetworkStackClient
  Simplify crash conditions in NetworkStackClient
  Proper handling of NetworkStack crash
2019-06-10 01:19:24 +00:00
Xiao Ma
e15f92e37f Merge "Fix the potential NullPointerException."
am: 4b5c8e1076

Change-Id: If2b68e47eacb1faf9ce50161322ccbed9c8253c8
2019-06-08 04:37:27 -07:00
Xiao Ma
4b5c8e1076 Merge "Fix the potential NullPointerException." 2019-06-08 11:21:44 +00:00
Jack Yu
d348075221 Merge "Supported data enabled override for different scenarios"
am: 8959a121ce

Change-Id: Ic607bd5ad608c75002a71010f73fa3c672c5b51a
2019-06-07 17:18:34 -07:00
Jack Yu
8959a121ce Merge "Supported data enabled override for different scenarios" 2019-06-07 23:58:15 +00:00
Jack Yu
a726a48fcd Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
(cherry picked from commit 0d26d718b3)
2019-06-07 14:47:13 -07:00
Al Sutton
377d3166e4 Merge "Update services/backup OWNERS to be current B&R team"
am: bdc8e00211

Change-Id: I278f27e80f466e7bd270af103a6a27ccbea94f86
2019-06-07 09:27:05 -07:00
Al Sutton
bdc8e00211 Merge "Update services/backup OWNERS to be current B&R team" 2019-06-07 16:04:55 +00:00
Ryan Savitski
024b5e6477 Merge "incident report args: add setter stubs & constant aliases"
am: cdcd19f560

Change-Id: I6edc89437a161a191e5ea1bd775fbbc9c0fcc59b
2019-06-07 08:22:54 -07:00
Ryan Savitski
cdcd19f560 Merge "incident report args: add setter stubs & constant aliases" 2019-06-07 14:28:45 +00:00
Ryan Savitski
1bbf28fa59 incident report args: add setter stubs & constant aliases
Bug: 130543265
Merged-In: Ieaf5b3b4d67168e2a99ff54e6392c77d8372ed4e
Change-Id: I855002050bf8a9f43b997060b1990f26eec597c7
2019-06-07 13:39:53 +01:00
Xiao Ma
a66de9c21e Fix the potential NullPointerException.
The networkAttributesParcelable retrieved from IpMemoryStore might be
null, it might cause crash with NullPointerException when attepmting
to read from the field on a null object reference.

Bug: 122710829
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Id7527199424e55f1e14836e81a5d1965d13013a2
2019-06-07 20:30:16 +09:00
Roland Levillain
7103a89d39 Use suffixes instead of stems in the definition of module app_process.
Test: Device boot test
Change-Id: Ibbf888383b4fe3204b71978243267765092d51c6
2019-06-07 12:02:04 +01:00
Al Sutton
c2fb67f846 Update services/backup OWNERS to be current B&R team
Change-Id: Ic5e0c5a1f5e9a3f87647187f0f63d61a2b7a19b2
Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e
Merged-In: I03d72ecec447304866d96e2f0908acbc2a1796b6
Merged-In: I69f6419055be4adc974041d78a1517ded7e5c57b
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 134730213
2019-06-07 11:20:19 +01:00
Lorenzo Colitti
3c695c1501 Merge "Don't use a high-priority notification on auto-join."
am: 49c91d93c9

Change-Id: I42c712c21c545c61300c7e740b4851e33a029cad
2019-06-07 01:39:38 -07:00
Martijn Coenen
93fe09a13c [automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock."
am: c4a564a10a -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history

Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831
2019-06-07 01:38:16 -07:00
Remi NGUYEN VAN
b408f11405 Add FrameworksNetDeflakeTest
The test currently deflakes ConnectivityServiceTest. It is not
configured anywhere in automated tests yet.

Test: atest FrameworksNetDeflakeTest
Bug: 134730673
Change-Id: I936e3cf44ef559c73ccc82a0c1f4f68cf05f1369
2019-06-07 17:35:17 +09:00
Lorenzo Colitti
49c91d93c9 Merge "Don't use a high-priority notification on auto-join." 2019-06-07 08:26:38 +00:00
Martijn Coenen
c4a564a10a Merge "Reconcile binder JNI with earlier changes, removing lock." 2019-06-07 08:23:00 +00:00
TreeHugger Robot
9d6da0fc44 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master 2019-06-07 07:06:19 +00:00
Remi NGUYEN VAN
f75f9d7925 Remove DeviceConfig usage from NetworkStackClient
DeviceConfig API is not yet submitted. Use Settings.Global instead, to
still allow writing tests against AOSP code (a test would try to use
adb shell device_config, and fallback to adb shell settings).

This is not merged anywhere else, the merged-in is here to ensure this
does not end up in branches that use DeviceConfig. This change should be
lost when AOSP is updated.

Test: flashed, force-crashed NetworkStack with different setting values:
      observe rate-limited crash
Bug: 133725814
Merged-In: I423ca6ebb328f49b170baae0da9b8409a6429fcb
Change-Id: I399d3e37f1faaecb8a30428c1989fac8821379d8
2019-06-07 14:38:43 +09:00
Lorenzo Colitti
938457e4e4 Don't use a high-priority notification on auto-join.
If the device connects to a network automatically and not through
user action, a high-priority notification is intrusive and is
inconsistent with other networking notifications, which are
usually only high priority if the network is manually selected.

Bug: 130766237
Test: see next CL in patch series
Change-Id: I8824f2d1a0efeb6cb75e430ef5159ebce0018779
2019-06-07 12:53:30 +09:00
Haibo Huang
ae21f0b06e Merge "Fix kotlinc warnings in EasterEgg."
am: d913216e27

Change-Id: Ib0128b40a8087096765b7268eaf2591973feb993
2019-06-06 19:15:37 -07:00
Remi NGUYEN VAN
85db764efe Merge "Add comments to frozen AIDL API files"
am: 714b313903

Change-Id: Ic7ef8bc0b2f22508e06ca56c4b030b2f12cde7ea
2019-06-06 19:10:38 -07:00
Haibo Huang
d913216e27 Merge "Fix kotlinc warnings in EasterEgg." 2019-06-07 02:07:56 +00:00
Aurimas Liutikas
86dbc0fb24 Fix kotlinc warnings in EasterEgg.
- Remove unused parameters / method
- Wrap uses nullable bitmap with "?.let {" and sadly !! as it is
  in fact theoretically possible that bitmap becomes null due to a
  call from a different thread.
- Run ktlint autofix up.

Bug: 112638508
Test: make -j EasterEgg
Change-Id: Idab21176ec9e4e61751a87c4aeafe3966ed10a8c
Merged-In: Idab21176ec9e4e61751a87c4aeafe3966ed10a8c
2019-06-07 02:07:24 +00:00
Remi NGUYEN VAN
714b313903 Merge "Add comments to frozen AIDL API files" 2019-06-07 01:55:52 +00:00
Jack Yu
45f38d4f48 Merge "Extend the service configuration for the binding service."
am: 7145807316

Change-Id: I1526021cf49f873159b66eeddf2cc39ad71655eb
2019-06-06 11:13:40 -07:00
Jack Yu
7145807316 Merge "Extend the service configuration for the binding service." 2019-06-06 17:51:54 +00:00
Paul Duffin
e6970c06d7 Merge "Allow the unsupportedappusage-annotation to be used for device variants"
am: a1df2cb009

Change-Id: Iad647ca2e8ef9bec7faf4804fedcd11fe2cbfddb
2019-06-06 08:45:56 -07:00
Treehugger Robot
a1df2cb009 Merge "Allow the unsupportedappusage-annotation to be used for device variants" 2019-06-06 15:30:47 +00:00
Neil Fuller
ee2ded047a Merge "Delete ByteStringUtils: it is no longer used"
am: a677e4d5a0

Change-Id: I6adb8c70f67a49bc256014fabbaedabdb3b42f54
2019-06-06 06:04:31 -07:00
Treehugger Robot
a677e4d5a0 Merge "Delete ByteStringUtils: it is no longer used" 2019-06-06 12:51:23 +00:00
Paul Duffin
5219758043 Allow the unsupportedappusage-annotation to be used for device variants
Some modules, e.g. libphonenumber-platform, depend on core platform API
solely for accessing the dalvik.annotation.compat.UnsupportedAppUsage
annotation. Building device variants of unsupportedappusage-annotation
will allow those modules to switch to core_current.

Bug: 134379140
Test: m droid
Change-Id: I1634b8ffd2a28c2663defd2a4a4e40d78b174d91
2019-06-06 13:28:23 +01:00
Remi NGUYEN VAN
2ee0c6b5f2 Add comments to frozen AIDL API files
Generated by re-freezing the API with the new aidl_interface code, and
replacing the previous API with the new files. This only adds comments.

Test: comments only, builds
Bug: 134452637
Change-Id: I6b3072e91170c97818c5fdb688d06fc612991ea1
2019-06-06 18:56:06 +09:00
Martijn Coenen
6ccf33b00c Reconcile binder JNI with earlier changes, removing lock.
Change Idbacb6ad14c43aff8030d70b5e17427b86e92d6e introduced
synchronization of the sProxyMap in Java, removing the need
for serialization (and having a native lock). But for some
reason, we did not remove it in AOSP.

Bug: 132922399
Test: builds
Change-Id: Ib2dc64a7716a1e4798b998e54fac298eb40a7c1d
Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
2019-06-06 11:17:59 +02:00