Commit Graph

440560 Commits

Author SHA1 Message Date
Anton Hansson
ac119a33c2 Allow com.android.* classes in system_service stubs
The android.* rule is meant to be for the public SDK.

Bug: 147559833
Test: m checkapi
Change-Id: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
Merged-In: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
(cherry picked from commit f74130f525)
2020-02-20 11:40:34 +00:00
Anton Hansson
b14743ce82 Merge "Enable compat checking & lint for system_services api" 2020-02-19 17:23:08 +00:00
Treehugger Robot
075c6b9db7 Merge "Rename ro.device_owner system property" 2020-02-19 17:12:43 +00:00
Rambo Wang
e73b46c9d9 Merge "Update javadoc of deprecated UICC APIs" 2020-02-19 17:10:20 +00:00
Anton Hansson
0e9166f15b Merge "Enable compat checking & lint for module_lib api" 2020-02-19 16:27:41 +00:00
Treehugger Robot
a9384cdc9b Merge "Key revocation check is permissive when device is unlocked" 2020-02-19 16:03:50 +00:00
Anton Hansson
0decfb1f8a Enable compat checking & lint for system_services api
These were previously turned off as there were no previous
releases to compare it to. Check in empty files as comparison.

Whitelist current lint problems for now (filed bugs to follow-up).

Bug: 149818061
Bug: 149818284
Bug: 147559833
Test: m checkapi
Change-Id: Ib4cbc84ac9a826f7b947c951c94f8f5578f4554d
Merged-In: Ib4cbc84ac9a826f7b947c951c94f8f5578f4554d
(cherry picked from commit daa9d88444)
2020-02-19 15:20:14 +00:00
Anton Hansson
626afea1bd Enable compat checking & lint for module_lib api
These were previously turned off as there were no previous
releases to compare it to. Check in empty files as comparison.

The new tethering APIs fail lint -- I have filed a release
blocking bug to get these cleaned up.

Bug: 149430003
Bug: 147559833
Test: m module-lib-api-api-lint
Test: m module-lib-api-check-last-released-api (with+without incompatibilities)
Change-Id: I2b171dc836ca121502fb345d8dd512a05c566a49
Merged-In: I2b171dc836ca121502fb345d8dd512a05c566a49
(cherry picked from commit 79e35c3beb)
2020-02-19 14:58:44 +00:00
Lorenzo Colitti
0568756e6e Merge "Tethering offload: add/remove IPv6 forwarding rules on ND events." 2020-02-19 13:41:10 +00:00
Lorenzo Colitti
fc7d7b5f0f Merge "Minimal support for IPv6 upstreams in IpServer tests." 2020-02-19 13:38:00 +00:00
Lorenzo Colitti
fb19f4953a Tethering offload: add/remove IPv6 forwarding rules on ND events.
Use IpNeighborMonitor to listen for ND cache events on the
downstream interface, and push downstream IPv6 fowarding rules
to netd.

Rules are pushed when:
- IPv6 neighbours appear/disappear on the downstream interface.
- The upstream changes.

Test: new unit test
Change-Id: I7b01ba179a4d6bb248fd6c4994e48800613a4efa
2020-02-19 20:50:43 +09:00
Treehugger Robot
b1ad41b62e Merge "Reduce advertised ipv6 mtu by 16 to fit ethernet header" 2020-02-19 11:20:29 +00:00
Yo Chiang
be20495f0b Key revocation check is permissive when device is unlocked
imageValidationThrowOrWarning() logs the error as a warning if device
bootloader is unlocked, else re-throw the error.
Device lock state is queried via PersistentDataBlockManager service.

Bug: 128892201
Test: adb shell am start-activity \
    -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
    -a android.os.image.action.START_INSTALL \
    --el KEY_USERDATA_SIZE 8192 \
    -d file:///storage/emulated/0/Download/aosp_arm64-dsu_test.zip \
    --es ${IMAGE_KEY}
Test: Observe the logcat
Change-Id: I895e70d90624afda2bf7cd3b34ea8d21a1702163
2020-02-19 11:11:29 +00:00
Treehugger Robot
3bdf29c1f6 Merge "Check DSU public key with key revocation list" 2020-02-19 11:04:29 +00:00
Maciej Żenczykowski
34d4361604 Reduce advertised ipv6 mtu by 16 to fit ethernet header
This is a temporary hack to workaround the inability of current
kernel's ebpf bpf_skb_change_mode() function to prefix a 14-byte
ethernet header on to a packet without going over the upstream
(source, rawip) interface's mtu *before* we bpf_redirect() to
the downstream (destination, ethernet) interface.

Test: build, atest, atest TetheringTests
Bug: 149816401
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I646148ebfd978a2489c0cd065e4b671b01150add
2020-02-19 10:44:54 +00:00
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
Rubin Xu
e4b77b8bf2 Rename ro.device_owner system property
Bug: 148437300
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I3986de71c3f0f737419702799099ac08bfc48139
2020-02-19 10:40:07 +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
Yo Chiang
a86e1ab30a Check DSU public key with key revocation list
Throw RevocationListFetchException if failed to fetch key revocation
list.
Throw KeyRevokedException if DSU intent or image public key is revoked.
Throw PublicKeyException if getAvbPublicKey() failed.

Bug: 128892201
Test: adb shell am start-activity \
    -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
    -a android.os.image.action.START_INSTALL \
    --el KEY_USERDATA_SIZE 8192 \
    -d file:///storage/emulated/0/Download/aosp_arm64-dsu_test.zip \
    --es KEY_PUBKEY ${IMAGE_KEY}
Test: edit the code so that imageValidationThrowOrWarning() always
Test: throw and observe the logcat and device notification
Change-Id: I33733c019b305c45e7d2511c44ef1d9b446ea52e
2020-02-19 09:32:36 +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