Commit Graph

440542 Commits

Author SHA1 Message Date
Lorenzo Colitti
c77639ef54 Minimal support for IPv6 upstreams in IpServer tests.
This makes the IpServer tests a bit more realistic. It is needed
by an upcoming change that adds new functionality, and is in its
own commit because it modifies the behaviour of all the existing
tests.

Test: atest TetheringTests
Change-Id: I8c3267bea983d1453c010b7b6b85548b9481a153
2020-02-19 19:43:23 +09:00
Mark Chien
195fc89155 Merge "Add tethering client callbacks" 2020-02-19 10:41:30 +00:00
Mark Chien
91bb789c20 Merge "Fix usage of annotations in TetheringLib" 2020-02-19 09:54:13 +00:00
Mark Chien
3e4ab5c2b5 Merge "Use framework-tethering-stub instead of framework-tethering" 2020-02-19 09:46:24 +00:00
Mark Chien
a0c1281870 Merge "Add TetheringTests to postsubmit" 2020-02-19 09:42:55 +00:00
Remi NGUYEN VAN
db5594d7bd Add tethering client callbacks
The callbacks are fired when the list of connected clients or their IP
addresses / hostname change.

Test: flashed, connected 2 devices, verified callbacks
Test: atest TetheringTests
Bug: 135411507
Change-Id: I96291038cf7b39a67547a5f74fcd7cbedc1ca002
Merged-In: I96291038cf7b39a67547a5f74fcd7cbedc1ca002
2020-02-19 17:05:00 +08:00
Remi NGUYEN VAN
2d14a4b3e0 Fix usage of annotations in TetheringLib
Annotations such as @SystemApi cannot be jarjared to a different
package, as the members would not match the system API declarations.

Instead, only build against the annotations from
framework-annotations-lib, but do not include them as classes in the
output jar; annotations are not required to be available to the
classloader at runtime.

Test: builds, boots, tethering working
Bug: 147812912
Fixes: 148609988
Change-Id: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
Merged-In: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
2020-02-19 16:32:26 +08:00
Benedict Wong
70f90282ef Merge changes from topic "settings-vpn"
* changes:
  Minor cleanup
  Add support for starting IKEv2/IPsec VPNs from settings
  Add always-on VPN support for platform VPNs
2020-02-19 07:39:41 +00:00
markchien
8cf2a5588b Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050
2020-02-19 15:10:44 +08:00
markchien
6810bc91d6 Add TetheringTests to postsubmit
The tethering unit tests were in FrameworksNetTests, but were moved out
so were no longer run in presubmit. Now put them to postsubmit first.
Should be moved to presubmit after a while.

Bug: 148998835
Test: atest --test-mapping frameworks/base/packages/Tethering:postsubmit

Change-Id: I9ca36cba7bfde8409a06dbeb7166337c55b39691
2020-02-19 14:43:16 +08:00
Benedict Wong
66da080ab8 Minor cleanup
This change fixes a few spelling and cleanup errors. I can't sphell.

Test: Comment change only
Change-Id: Ieca3e1490be7ba6b3daf893624e1ea82bdcc4e37
2020-02-19 05:17:51 +00:00
James Wei
2f9800a47d Merge "USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions" 2020-02-19 03:04:09 +00:00
Benedict Wong
24a2be8275 Add support for starting IKEv2/IPsec VPNs from settings
This commit allows the startLegacyVpn() call to start Platform VPN
profiles, allowing Settings to use the IKEv2/IPsec VPN options

When using an aliased private key, the
Ikev2VpnProfile.KEYSTORE_ALIAS_PREFIX must be prepended to the front of
the alias. This will in turn result in the fromVpnProfile() function to
pull the key from the KeyStore, as opposed to the inline-key that the
VpnManager API uses.

Bug: 148991741
Test: FrameworksNetTests passing, new tests added in subsequent CL
Test: Manually tested
Change-Id: Icbca695c353b2e12e99305676404dbf1a4495949
2020-02-19 02:44:34 +00:00
Joshua Duong
c5cb13899d Merge "Add AdbTransportType.aidl. Add AdbWifi internal API stubs." 2020-02-19 02:41:32 +00:00
Joshua Duong
b401e0a8bb Add AdbTransportType.aidl. Add AdbWifi internal API stubs.
Since wireless debugging can be enabled without usb debugging enabled,
we'll need to differentiate between which transport is enabled.

Also added the internal AdbManager stubs for wireless debugging. Adding
implementation in separate CL to get around merge conflict with a SysUI
CL in the stack.

BUG: b/111434128

Test: make
Exempt-From-Owner-Approval: already approved
Change-Id: I4e1ae6398f291f321e61e7eb119564ebd5e54c2e
2020-02-19 02:41:21 +00:00
Treehugger Robot
857636e059 Merge "Declare a public field for new Japanese Era Reiwa" 2020-02-19 01:30:47 +00:00
Junyu Lai
7e0dbc53e3 Merge "[SP15] Remove unused getVtDataUsage in TelephonyMananger" 2020-02-19 01:10:38 +00:00
Joshua Duong
085565313b Merge "[adbwifi] Add settings event for opening adb device details." 2020-02-19 00:59:17 +00:00
Junyu Lai
cde5e170b0 Merge "[SP12] Remove the usage of getVtDataUsage" 2020-02-19 00:13:02 +00:00
Treehugger Robot
42ab50d14b Merge "Improve BaseBundle#kindofEquals" 2020-02-18 23:56:30 +00:00
Benedict Wong
522f3c932d Add always-on VPN support for platform VPNs
This commit allows Platform VPNs to be started as part of always-on
mode.

Test: FrameworksNetTests passing, new tests added in subsequent CL
Test: Manually tested.
Change-Id: I5eda88e5b406a0e425eb7424665cf702e0979324
Merged-In: I5eda88e5b406a0e425eb7424665cf702e0979324
2020-02-18 22:13:31 +00:00
Andy Hung
ff78aab391 Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" 2020-02-18 21:48:53 +00:00
Treehugger Robot
217aadd0c2 Merge "Consume health HAL 2.1 values from framework" 2020-02-18 20:45:15 +00:00
nchalko
f3681741e3 Merge "Add encoding information to TvTrackInfo" 2020-02-18 18:57:34 +00:00
Evgenii Stepanov
077e78a71f Merge "Refactor NativeHeapTagging compat feature." 2020-02-18 18:47:55 +00:00
Amit Mahajan
223696559f Merge "Use month in the range 1-12 for 3GPP2 SMS Time Stamp instead" 2020-02-18 18:40:30 +00:00
Kyeongkab.Nam
ada0f3079c Add encoding information to TvTrackInfo
Add TIF API for getting encoding in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
Merged-In: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
2020-02-18 17:45:00 +00:00
Treehugger Robot
fbbb808b2a Merge changes I758270b8,Ic08b2b06
* changes:
  Adds --force-queryable option to adb install
  Revert "DO NOT MERGE: Adds --force-queryable option to adb install"
2020-02-18 17:30:48 +00:00
Andrei-Valentin Onea
8f269473b2 Merge changes from topic "add-caching-platformcompat"
* changes:
  Cache binder calls in CompatChanges
  Add property-invalidated cache
2020-02-18 17:16:09 +00:00
Nikita Iashchenko
73d22d5abc Declare a public field for new Japanese Era Reiwa
Integrate OpenJDK commit for new Japanese Era name:

 * 8174268: Declare a public field in JapaneseEra for the era starting May 2019
   http://hg.openjdk.java.net/jdk/jdk/rev/6a4abdb6749c

Bug: 149437171
Test: CtsLibcoreTestCases CtsLibcoreOjTestCases
Merged-In: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147
Change-Id: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147
2020-02-18 16:34:04 +00:00
Joshua Duong
3654ed4c77 [adbwifi] Add settings event for opening adb device details.
Bug: 111434128
Bug: 63719597

Test: make
Exempt-From-Owner-Approval: cherry-pick
Change-Id: I8927e3f106b9cdaebe95ec56c675704baa1d1542
Merged-In: I8927e3f106b9cdaebe95ec56c675704baa1d1542
2020-02-18 07:23:23 -08:00
Patrick Baumann
264700a361 Adds --force-queryable option to adb install
This change adds support for parsing the --force-queryable option from
adb install. When implemented will enable test infrastructure to bypass
most issues that would be encountered by app enumeration without
changes.

Bug: 142386643
Test: run `adb install --force-queryable ...`
Merged-In: Id793ac39a4dfb022fc5e4c0c1230a3da77bf41c6
(cherry picked from commit f3a0386b74)

Change-Id: I758270b8fd18756d02eff4f18f1e450cbc3367cc
2020-02-18 14:57:50 +00:00
Patrick Baumann
e464d16f7d Revert "DO NOT MERGE: Adds --force-queryable option to adb install"
Reason for revert: Remove do not merge
Reverted Changes:
I0b14de9c5:DO NOT MERGE: Adds --force-queryable option to adb...

Change-Id: Ic08b2b0660f8fc5af70b7724958f7d3d005b7c18
2020-02-18 14:56:18 +00:00
Treehugger Robot
ecd7c440df Merge "Add getAvbPublicKey to IDynamicSystemService" 2020-02-18 12:21:25 +00:00
Yo Chiang
d25e639b4e Add getAvbPublicKey to IDynamicSystemService
Wrapper for IGsiService::getAvbPublicKey()

Bug: 146418878
Test: Build pass
Change-Id: I67030bf0587297dc20e791c856c7373d473ae027
2020-02-18 18:32:44 +08:00
Treehugger Robot
f8af692214 Merge "Check for dump permission before other permissions." 2020-02-17 22:31:24 +00:00
Benedict Wong
88ec62afa9 Merge changes Ide9daebc,Id47ada57
* changes:
  Ensure all VPN runners clean up state when exiting
  Enforce restricted user, getConnectionOwnerUid checks
2020-02-17 21:30:35 +00:00
atrost
c14c79bbf3 Check for dump permission before other permissions.
There are test that rely on that being checked first.

Bug: 149350547
Test: atest android.security.cts.ServicePermissionsTest#testDumpProtected
Change-Id: Ifeac7219c217ee522af442e46dc7832b6afb9e42
2020-02-17 19:35:35 +00:00
Chiachang Wang
0ab508981a Merge "Add NETWORK_SETTINGS to SystemApi" 2020-02-17 11:04:51 +00:00
Remi NGUYEN VAN
318a6b763c Add NETWORK_SETTINGS to SystemApi
The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api
Change-Id: I10eb0273461063149a8d0eec92e2aaadea0680bd
Merged-In: Ia617ea56aba18f98371d7dbd546679e0327bfacd
2020-02-17 11:04:38 +00:00
Taesu Lee
c8ec731663 Use month in the range 1-12 for 3GPP2 SMS Time Stamp instead
Zero-based month is not needed anymore since android.text.format.Time is
replaced with LocalDateTime. For the safety, just rename "month" to
"monthOrdinal" in the range 1-12.

Bug: 146021623
Test: atest CdmaSmsTest

Change-Id: I0eb5bad9b3701217a6e4f44bfcd76013576d79d5
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-02-17 17:55:25 +09:00
Treehugger Robot
1c91a3d51b Merge "[vts-core] add vts_permission_validate_test to vts-core" 2020-02-17 07:49:45 +00:00
SongFerng Wang
b9e141bc55 Merge "Config of LTE signal strength default value remove SNR" 2020-02-17 05:34:16 +00:00
Stephane Lee
90bf87449f Consume health HAL 2.1 values from framework
Bug: 148816661
Test: Ensure that there are no issues with the time to full when
charging
Change-Id: Ie21d451432cd65a91303a8faf40df64935f5c4bb
2020-02-15 16:51:02 -08:00
Lorenzo Colitti
f202725395 Merge changes from topics "capport_dhcpresults", "nm_cb_capport"
* changes:
  Add CaptivePortalApiUrl to DhcpResults
  Send LinkProperties update on new capport data
2020-02-15 17:22:18 +00:00
Nicolas Geoffray
ae50e15d59 Merge "Revert "[DexLoadReporter] Report classloader contexts directly f..."" 2020-02-15 17:14:15 +00:00
Nicolas Geoffray
371fcb7cf2 Revert "[DexLoadReporter] Report classloader contexts directly f..."
Revert "Fix shared libraries not being reported via Reporter"

Revert submission 1198456-slclc

Reason for revert: Fails on luci:
https://ci.chromium.org/p/art/builders/ci/host-x86_64-cdex-fast/3123

Exempt-From-Owner-Approval: pure revert

Bug: 148494302
Reverted Changes:
I46d8d9105: Fix shared libraries not being reported via Report...
I00357cfe0: [DexLoadReporter] Report classloader contexts dire...

Change-Id: Ib58066e8f059642a11d9eaab02ec0b8b3217e487
2020-02-15 17:13:58 +00:00
Treehugger Robot
c2050ac731 Merge "Catch correct exception for adding route fail" 2020-02-15 06:20:53 +00:00
markchien
d72cf2cd33 Catch correct exception for adding route fail
Bug: 149535950
Test: OFF/ON hotspot
Change-Id: Ic52e2b2f3cec1a39a70302c41ab67ec1a1a55b1a
2020-02-15 11:35:00 +08:00
Chiachang Wang
a853d2dc37 Merge "Update state in NetworkInfo when network resumes" 2020-02-15 03:16:31 +00:00