445542 Commits

Author SHA1 Message Date
Benedict Wong
f44b90fdc4 Merge "Add methods for IKEv2/IPsec test mode profiles" 2020-05-15 02:18:02 +00:00
Amit Mahajan
6bf3920e7d Merge "Add a helper function to query CBR package name." 2020-05-14 21:43:53 +00:00
Amit Mahajan
af04513267 Add a helper function to query CBR package name.
Test: manual
Bug: 154436403
Change-Id: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
Merged-in: Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0
(cherry picked from commit 6c99ce67524871e1cd25d883287193f33fbfac3f)
2020-05-14 13:04:47 -07:00
Treehugger Robot
fbb827fe24 Merge "Convert much of f/b/data/fonts/Android.mk to Android.bp" 2020-05-14 16:03:36 +00:00
Treehugger Robot
8f40ffebae Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" 2020-05-14 16:00:27 +00:00
markchien
32e772f9ce Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests
Bug: 156557122
Test: atest TetheringTests

Change-Id: Id9c0397306f3872fc23520d1354f338035a96dc9
2020-05-14 16:42:22 +08:00
Xiao Ma
1e83ce23e1 Merge "Support MirrorLink DHCPDECLINE." 2020-05-14 06:27:16 +00:00
Dan Willemsen
276c4eb05b Convert much of f/b/data/fonts/Android.mk to Android.bp
The Serif symlinks haven't been used since 2014, so I removed them.

Test: treehugger
Test: m fonts.xml DroidSansMono.ttf AndroidClock.ttf, ensure same installed files
Change-Id: I496498e0debac37f5fff4b9e046813e6b2694fd5
2020-05-13 20:22:42 -07:00
Amit Mahajan
a633854473 Merge "Remove cellbroadcast_default_package config as its unused now." 2020-05-14 00:36:57 +00:00
Treehugger Robot
16d1603b81 Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" 2020-05-13 23:53:47 +00:00
Amit Mahajan
f6a509278e Remove cellbroadcast_default_package config as its unused now.
Test: manual
Bug: 154436403
Change-Id: Id06456d23cc63c8cf1b4e26ba7f7d3b0c348eb46
Merged-in: Id06456d23cc63c8cf1b4e26ba7f7d3b0c348eb46
2020-05-13 16:17:11 -07:00
Suren Baghdasaryan
f85d141839 Fix Lost RAM calculation by accounting for ION mapped heaps
ION mapped heaps are not reflected in process PSS because ION driver
maps them using remap_pfn_range that sets VM_PFNMAP flag for each
mapped ION heap VMA and consequently excludes these VMAs from PSS
calculation. Change memory accounting to consider ION mapped heaps
as part of kernel used memory which fixes the Lost RAM calculation
that currently includes mapped ION heaps.

Bug: 155409819
Test: verify Lost RAM after opening camera app
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I2bad40bbe7d14b1c61534d661b612200ef1084e4
Change-Id: I2bad40bbe7d14b1c61534d661b612200ef1084e4
2020-05-13 22:04:30 +00:00
Treehugger Robot
0941dd3d04 Merge "Do not rename R.java package" 2020-05-13 17:08:18 +00:00
Treehugger Robot
5d36f01873 Merge "Make members final in TetheringService" 2020-05-13 16:04:58 +00:00
Ryan Mitchell
9ed5638125 Do not rename R.java package
When the --rename-resources-package flag is used, only rename the
package name within the resources.arsc. Generate the R.java under
the package name defined by the manifest unless --custom-package is
used.

(This is a cherry pick.)

Bug: 147434671
Test: manual
Merged-In: Id9d10e16f32533da1b67ab72ac846791526e7a76
Change-Id: Id9d10e16f32533da1b67ab72ac846791526e7a76
2020-05-13 09:04:14 -07:00
Xiao Ma
2b539941ba Support MirrorLink DHCPDECLINE.
Add the specific implementation of onNewPrefixRequest callback
on IpServer side, also refactor some common code.

Bug: 130741856
Test: atest TetheringTests
Change-Id: If2871bf899cb5890bbfee18063a194c92b6f474e
2020-05-13 23:29:49 +09:00
markchien
9ee6a954fd Make members final in TetheringService
1. Move isTetheringSupport logic from TetheringService to Tethering.
2. Small readability improvement in TetheringTest. Also change
config_tether_upstream_automatic from false to true in TetheringTest.
So TetheringTests would default run automatic select upstream flow
instead of selecting by legacy perferred network type list.

Bug: 153609486
Test: atest TetheringTest
Change-Id: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
Merged-In: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
2020-05-13 12:25:15 +00:00
Paul Duffin
8adff7229c Merge "Cleanup packages/Tethering/common/TetheringLib" 2020-05-13 10:40:43 +00:00
Paul Duffin
267dd95c3e Cleanup packages/Tethering/common/TetheringLib
Merge the otherwise unused tethering-aidl-interfaces into
framework-tethering.

This is in preparation for converting to use java_sdk_library.

Bug: 155164730
Test: m droid
Change-Id: I4583539d11ba69320aa5a0dfcfee072c81affac2
2020-05-13 09:56:18 +01:00
Mark Chien
f77020b25e Merge "Add test for OffloadHardwareInterface" 2020-05-13 08:39:32 +00:00
markchien
2c5c657ab1 Add test for OffloadHardwareInterface
Bug: 145490751
Test: atest TetheringTests

Change-Id: Ia402a6caaa0dfaa05d25a02101c515bbd884d33f
2020-05-13 14:36:42 +08:00
Benedict Wong
63d2bfd257 Add methods for IKEv2/IPsec test mode profiles
This change adds the ability for IKEv2/IPsec VPN profiles to run on Test
Networks. If enabled, the IKEv2/IPsec VPN profiles will request ONLY
test networks.

Bug: 148582947
Test: FrameworksNetTests passing
Test: Added for testing
Change-Id: I2511b39b27a1e29ae97907cdb12728d13fb1628f
2020-05-12 22:55:55 -07:00
Inseob Kim
bb11b35c03 Merge "Remove sys.vdso property" 2020-05-13 04:52:07 +00:00
Inseob Kim
4f2a6a2405 Remove sys.vdso property
This is an experimental property on Q and doesn't need anymore.

Exempt-From-Owner-Approval: cherry-pick

Bug: 154885206
Test: N/A
Change-Id: Ibb09e17703fbc95fe41542d335311b68553502a0
Merged-In: Ibb09e17703fbc95fe41542d335311b68553502a0
(cherry picked from commit dfafe03cb45b249ecdab38cb8015156453820a3c)
2020-05-13 12:06:33 +09:00
Treehugger Robot
3fd2c5c435 Merge "Fix 'associated' javadoc typos" 2020-05-12 22:35:01 +00:00
Maciej Żenczykowski
88536883e2 Merge "A minor followup change for BPF offload device option stuff" 2020-05-12 18:38:10 +00:00
Cody Kesting
655b811c3d Merge "Create TestApi for simulating a Data Stall on ConnectivityService." 2020-05-12 16:52:35 +00:00
Cody Kesting
b54e6b4377 Merge "Set owner and administrator UIDs for test networks." 2020-05-12 16:52:07 +00:00
Anna Trostanetski
06e2fe837a Merge "Remove atrost (and dbrazdil) from OWNERS files." 2020-05-12 15:33:57 +00:00
Tyler Gunn
2e46eac097 Merge "Ensure conference state is posted to Telecom for new conferences." 2020-05-12 15:12:53 +00:00
atrost
9cd0ba571c Remove atrost (and dbrazdil) from OWNERS files.
Test: none
Change-Id: If82422229d1b4cbed5e72d1c9042bd6a38be54e5
2020-05-12 12:36:02 +01:00
Hungming Chen
a4e6f7b68c A minor followup change for BPF offload device option stuff
- Correct description and spelling in the code and xml files.
- Add a TODO for refactoring the IpServer constructor.
- Refine the if-statement for starting IP neighbor monitor.

Test: atest IpServerTest
Change-Id: If9c8bc6f785fa80575db56de4e223292e9807ace
2020-05-12 19:15:24 +08:00
Nucca Chen
c26ad188b7 Merge changes I2d6f80f0,I9c26852d
* changes:
  Use device option to control BPF offload features
  Add tether BPF offload config to device config and resource
2020-05-12 11:00:04 +00:00
Treehugger Robot
349631528b Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" 2020-05-12 09:51:35 +00:00
Remi NGUYEN VAN
5aa7d63bd5 Merge "Send full LinkProperties to NetworkMonitor" 2020-05-12 08:13:05 +00:00
Treehugger Robot
963c11e32d Merge "Add day-night-mode permission to Shell." 2020-05-11 22:36:27 +00:00
Shuo Qian
a059affff3 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" 2020-05-11 22:27:44 +00:00
Treehugger Robot
1b9f4b926c Merge "Grant ACCESS_SHARED_LIBRARIES permission to Shell for testing." 2020-05-11 22:18:57 +00:00
Tyler Gunn
1036237bb5 Ensure conference state is posted to Telecom for new conferences.
There is an edge-case where an IMS conference fails to merge two
participants into a conference, AND the conference event package comes in
before the ImsCall indicates it is multiparty.  In this case, the CEP
will have a single participant which means we'll treat the call as a
standalone call.  ImsConference correctly sets the conference state, but
this was previously just passed along the ConnectionService adapter
to Telecom.  In this case the conference isn't even added to Telecom so
the method call in effect does nothing.

Changed to cache the conference state and ensure when adding the conference
to Telecom that we call the setConferenceState method (yeah, could have
put this in the ParcelableConference, but this is an edge case).

Test: Wrote unit test to verify property is set.
Bug: 134047008
Fixes: 155097934
Merged-In: I203880c593f6bac471a06eb9dcbb529d0bb75ba5
Change-Id: Ib48437abb1295d147e227727ce4ff2996f28b5de
2020-05-11 14:29:44 -07:00
Hai Zhang
68cc951bf6 Grant ACCESS_SHARED_LIBRARIES permission to Shell for testing.
Bug: 154348597
Test: presubmit
Change-Id: I75f07b88c6eca9d2296d3bcdbcc43ad9ff382023
Merged-In: Ic721288e8f1e1a1f255eca95b2efb7b6e0c7c83b
2020-05-11 21:06:35 +00:00
Tyler Gunn
68a50c1b2f Merge "Fix parceling and unparceling for URIs in Telecom." 2020-05-11 21:04:58 +00:00
Shuo Qian
e2faa8fff8 Modify the default values to avoid 2 DB hysteresis DB limitation
Test: Treehugger
Bug: 155026280
Change-Id: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
Merged-In: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
(cherry picked from commit 66c51cda9711b7d9473f64db33fbc72846069d97)
2020-05-11 20:57:28 +00:00
Rambo Wang
1926b83e85 Merge "LTE+ indicator not shown when attached to CA network" 2020-05-11 20:04:05 +00:00
Tyler Gunn
04e1fd15f6 Fix parceling and unparceling for URIs in Telecom.
When testing parceling and unparceling of numbers with postdial digits
it appears in parcelling to the dialer there were some cases where
the commas were being URL encoded during parceling.

Elsewhere in the platform the Uri.writeToParcel and
Uri.CREATOR.createFromParcel methods are used.  Switching to those methods
ensured that the parceling did not uri-encode on parcel/unparcel.
GatewayInfo already used the right method to unparcel.

Test: Unit/CTS tests.
Bug: 152172598
Fixes: 155098148
Merged-In: I87b881e55a749e0ea46ba3b3c7d297856a744f37
Change-Id: I32b7d049107cb3901fd934dc609541d1d2622a5a
2020-05-11 12:55:29 -07:00
Kweku Adams
6adfa79de1 Add day-night-mode permission to Shell.
Without the permission "adb shell cmd uimode night <mode>" doesn't work.
Adding the permission to the AndroidManifest file so the shell command
will work.

Bug: 155584597
Test: run `adb shell cmd uimode night <no|yes|auto>`
Change-Id: Ibfb145d762c73bba9de639d4050b9b26e4778cc9
2020-05-11 11:46:34 -07:00
Rambo Wang
35c8eb194a LTE+ indicator not shown when attached to CA network
NetworkTypeController (or DcTracker in aosp/master) will set lte
display type to LTE_CA when current ServiceState fulfills one of the
following conditions:
- getDataNetworkType return NETWORK_TYPE_LTE_CA
- isUsingCarrierAggregation return true

NetworkRegistrationInfo#getAccessNetworkTechnology() always returns LTE
when data rat is LTE CA. So the first condition will never get
fulfilled.

isUsingCarrierAggregation flag will only get updated when
ServiceStateTracker calls RatRatcheter.ratchet without location change.
This makes isUsingCarrierAggregation flag not always reliable to
determine if carrier aggregation is on.

The CL fix the issue by changing ServiceState#isUsingCarrierAggregation
to return true when ServiceState#getCellBandwidths return more than one.
The same condition is already used by RatRatcheter when set
isUsingCarrierAggregation flag in RatRatcheter#ratchet.

Bug: 154060784
Test: atest com.android.internal.telephony.ServiceStateTest
Test: atest android.telephony.cts.ServiceStateTest
Merged-In: Ie6c07cb58d2a40eeb10e8f0131c98212ba463517
Change-Id: Ie6c07cb58d2a40eeb10e8f0131c98212ba463517
(cherry picked from commit 8a41bbf466e78a63828ba03dde754f6879ad7e34)
2020-05-11 09:44:49 -07:00
Treehugger Robot
2146766783 Merge "Add the NOT_SUSPENDED capability to Ethernet - doc part" 2020-05-11 13:25:28 +00:00
andrewlewis
5b075b8f2a Fix 'associated' javadoc typos
Change-Id: I4ff16ec3d6bd1d98bb04b647a38f12af87286a5e
2020-05-11 11:57:25 +00:00
Treehugger Robot
b80e0dac87 Merge "Add lint-baseline.txt files for test base/runner/mock" 2020-05-11 11:18:17 +00:00
Treehugger Robot
932b0b27b6 Merge "InProcessTethering: set min_sdk_version" 2020-05-11 09:21:17 +00:00