Commit Graph

438074 Commits

Author SHA1 Message Date
Neil Fuller
ce0ca9c511 Merge "Fix DevicePolicyManager setTime() behavior / tests"
am: 7d64d299a3

Change-Id: Ibad73619b71c262e98889ef0dee2f278749a5258
2019-12-02 10:15:05 -08:00
Neil Fuller
7d64d299a3 Merge "Fix DevicePolicyManager setTime() behavior / tests" 2019-12-02 18:05:31 +00:00
Anton Hansson
3b2c30fd30 Merge "Add apex build rule for com.android.sdkext"
am: 139a120487

Change-Id: I59746f94adb6127ed631363623332ba9c1468bd4
2019-12-02 09:19:26 -08:00
Anton Hansson
139a120487 Merge "Add apex build rule for com.android.sdkext" 2019-12-02 17:09:16 +00:00
Steven Moreland
c8d045a384 Merge "Binder: add markVintfStability"
am: 4bdfc3c05c

Change-Id: I232f3db9979d47caaef0d5d75c263c8cfb7119c7
2019-12-02 08:50:57 -08:00
Steven Moreland
4bdfc3c05c Merge "Binder: add markVintfStability" 2019-12-02 16:46:17 +00:00
Neil Fuller
44fcf29a02 Fix DevicePolicyManager setTime() behavior / tests
Fix DevicePolicyManagerService setTime() behavior and associated CTS
tests. Since change ID If48d465fce04c094a997b25c8b62fcf0c3386ebe,
DevicePolicyManagerService calls TimeDetector.suggestManualTime().
Before doing so it clears client permissions so it is reliant on system
server permissions. The permission check for suggestManualTime() should
therefore be a enforceCallingOrSelfPermission() not a
enforceCallingPermission().

Bug: 145508391
Bug: 140712361
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testSetTime
Change-Id: I20678e145127fd67f356f1c29abc30b484278231
2019-12-02 16:45:40 +00:00
Anton Hansson
5fd63b6571 Merge "Add scaffolding for 'sdkext' module"
am: 728048b49e

Change-Id: If2e3a5b89b211dbf6bf150591091bcf4431624f0
2019-12-02 08:32:58 -08:00
Anton Hansson
728048b49e Merge "Add scaffolding for 'sdkext' module" 2019-12-02 16:23:48 +00:00
Anton Hansson
5559245baa Add apex build rule for com.android.sdkext
Bug: 137191822
Test: m com.android.sdkext
Change-Id: I8b349e7b4705f0d9d3f2125778e2c6b6d0638879
2019-12-02 14:24:54 +00:00
Anton Hansson
98460abc89 Add scaffolding for 'sdkext' module
This module will have a java framework part as well as a native
binary. Add directory and hook future java sources into the stub
rules.

Bug: 137191822
Test: m
Change-Id: I5527a055bf935178b88a1b20504b251f18f3d873
2019-12-02 13:56:06 +00:00
Chalard Jean
bf07d802ec Merge changes I720a1feb,I9539b8cc,Ib79b777b
am: 82001cf993

Change-Id: Ieaa1371f6e52074b76e3353ea9a2653c783ff04e
2019-12-02 01:51:07 -08:00
Chalard Jean
82001cf993 Merge changes I720a1feb,I9539b8cc,Ib79b777b
* changes:
  [NS A17] Update linger state after rematching.
  [NS A16] Cleanup
  [NS A15] Move legacy default broadcasts out of the loop
2019-12-02 09:40:44 +00:00
Chalard Jean
f477d5c4c6 Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
am: 5cf5b30990

Change-Id: Ibe34e78e53a15e987042703fdd27d6393e4e7d59
2019-12-01 21:26:44 -08:00
Chalard Jean
5cf5b30990 Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
* changes:
  [NS A14] Move code notifying battery stats in its right place
  [NS A13] Move legacy broadcast handling after rematch.
  [NS A12] Move some legacy type tracker handling to a function
  Add tests for ConnectivityService → BatteryStats messages
2019-12-02 05:17:39 +00:00
Mark Chien
f1960474b1 Merge "[Tether17] create com.android.tethering.apex package"
am: 89deaefdfb

Change-Id: Iabd33fc9e016b3d38c34ec8080e95f04feb96670
2019-12-01 20:20:27 -08:00
Mark Chien
89deaefdfb Merge "[Tether17] create com.android.tethering.apex package" 2019-12-02 04:11:35 +00:00
Chalard Jean
a3984a18dd [NS A17] Update linger state after rematching.
Test: FrameworksNetTests NetworkStackTests
Change-Id: I720a1feb89088aa123201ef5867de444234343e8
2019-12-02 13:02:41 +09:00
Chalard Jean
0147c90f16 [NS A16] Cleanup
Move LegacyTypeTracker work into a function for readability.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I9539b8cc4422b3a0cc1d3d9b3a44d59dc1905b44
2019-12-02 13:02:41 +09:00
Chalard Jean
18ee53f90b [NS A15] Move legacy default broadcasts out of the loop
Test: FrameworksNetTests NetworkStackTests
Change-Id: Ib79b777b5efda3a4c85c30055f1a6d03d5d04c25
2019-12-02 13:02:41 +09:00
Chalard Jean
bbaa33e1d3 [NS A14] Move code notifying battery stats in its right place
This should be done once every time an interface comes online.
Doing this in updateLinkProperties guarantees this happens every
time a new interface comes online, but it doesn't do it more
often than needed.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I0613c23f44192944266d76107308da8d1c541d1c
2019-12-02 13:02:38 +09:00
Chalard Jean
7dfd758583 Merge "Give apps access to the NAT64 prefix."
am: ce149dba87

Change-Id: I673a44f3f75a2395ae3d9d436c83708f20f414e6
2019-12-01 18:20:00 -08:00
easoncylee
66ddcdeaf9 Merge "Convert apct/framework/input_method_core_test-cloud-tf to Test Mapping Suite."
am: 371a8b50bd

Change-Id: I9e77a01b90b8fa2c5a531d58c0d9daa140b962b8
2019-12-01 18:16:46 -08:00
Treehugger Robot
ce149dba87 Merge "Give apps access to the NAT64 prefix." 2019-12-02 02:05:16 +00:00
Treehugger Robot
371a8b50bd Merge "Convert apct/framework/input_method_core_test-cloud-tf to Test Mapping Suite." 2019-12-02 02:04:28 +00:00
markchien
daae20bc5d [Tether17] create com.android.tethering.apex package
Add APEX com.android.tethering.apex for tethering module.
It have tethering apk now and would have jar and library
in follow up CL.

Bug:144320626
Test: build
Change-Id: Ie6158639886e90180dd90347e802a5fe062031b2
2019-12-02 01:54:31 +00:00
Tobias Thierer
4eed4ccc56 Merge "Android.bp: Add comment about APEX stub dependency for MimeMap."
am: bb2531f16b

Change-Id: I2b0fe7f13be17c8a0f3c1d28fd94b38a0e8d7d27
2019-12-01 12:20:11 -08:00
Tobias Thierer
bb2531f16b Merge "Android.bp: Add comment about APEX stub dependency for MimeMap." 2019-12-01 20:07:35 +00:00
Tobias Thierer
c21fae57f8 Merge "Tweak framework-mime / mimemap dependencies."
am: 8f05b2ef50

Change-Id: I9fe70f6e9fd8aae52a3e3f8ee140972513fb091f
2019-11-30 20:55:19 -08:00
Treehugger Robot
8f05b2ef50 Merge "Tweak framework-mime / mimemap dependencies." 2019-12-01 04:35:34 +00:00
Mark Chien
4bb02709c5 Merge changes from topic "tether_migrate"
am: e8401aff92

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
2019-11-30 04:26:07 -08:00
markchien
6b828d2915 [Tether07] Migrate Tethering into module
am: 0df2ebc43d

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc
2019-11-30 04:25:57 -08:00
markchien
510a354082 [Tether07] Clean up build rule for libtetheroffloadjni
am: d8676d99ff

Change-Id: I4aceaf21df1a8c298c7886f6b66a76849818a01c
2019-11-30 04:25:43 -08:00
Mark Chien
e8401aff92 Merge changes from topic "tether_migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-30 12:17:47 +00:00
Chalard Jean
f9e2215cc4 Give apps access to the NAT64 prefix.
Apps that do their own DNS queries need to know the NAT64 prefix
to resolve v4 addresses on v6-only networks.

Test: FrameworksNetTests NetworkStackTests
Bug: 144877069
Change-Id: I5a255b7afc2038646b93a0ab893f8ad62d0fb34f
2019-11-30 10:25:02 +00:00
markchien
b741c646c6 [Tether10]Remove UserManagerInternal usage in Tethering
To be the unbundled application, tethering can not use UserManagerInternal
method anymore. Replace it by listening user restriction change intent.

Also fix some cleanup from
https://android-review.googlesource.com/c/platform/frameworks/base/+/1131002

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -manual test. Add a trigger point to call
       UserManager.setUserRestriction(DISALLOW_CONFIG_TETHERING) from
       Settings. Open hotspot -> restrict tethering from new adding trigger
       point -> hotspot is OFF and Tethering settings are not available.

Change-Id: I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1
Merged-In: I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1
2019-11-30 10:06:23 +00:00
markchien
0df2ebc43d [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
markchien
d8676d99ff [Tether07] Clean up build rule for libtetheroffloadjni
- Statically include android.hardware.tetheroffload.config@1.0,
  libcutils and their dependency library.
- Use shared-lib if there is NDK or NDK-compliant version
- Remove android.hardware.tetheroffload.control-V1.0-java from
  service.core because it is already statically built in tethering apk

Bug: 143195885
Test: -build, flash, boot
Change-Id: Ic082045bc04d3989f7f095c7a499bc0d943e4031
Merged-In: Ic082045bc04d3989f7f095c7a499bc0d943e4031
2019-11-30 09:57:36 +00:00
Tobias Thierer
8296853914 Android.bp: Add comment about APEX stub dependency for MimeMap.
This addresses a review comment on https://r.android.com/1172924

Test: Treehugger
Change-Id: Ic2106aebf707c9d347f06d5a0dab18614e0ad5a3
2019-11-29 19:42:11 +00:00
Tobias Thierer
17d0c59338 Tweak framework-mime / mimemap dependencies.
This CL addresses an outstanding review comment from
https://r.android.com/1115772 . To be honest, I don't
fully get the semantics of what I've changed, so I've
followed Jiyong's suggestions pretty blindly, except
that I've added the static dependency on mimemap to
framework-minus-apex as opposed to the (non-existing)
frameworks.

Test: Confirmed that the data files are still in framework.jar by
      rebuilding (make installclean && make droid && flashall )
      and then running:
      adb shell su 0 unzip -l /system/framework/framework.jar | grep types
Test: atest CtsMimeMapTestCases
Change-Id: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
Merged-In: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
2019-11-29 19:42:03 +00:00
Suprabh Shukla
040206bfcc Merge "Adding version code R for development"
am: b578bdbe43

Change-Id: I704d797eb4c3c0f2ffc449cb32681e68fcf7cc16
2019-11-29 09:18:22 -08:00
Treehugger Robot
b578bdbe43 Merge "Adding version code R for development" 2019-11-29 17:10:43 +00:00
Chalard Jean
24b7fe0108 [NS A13] Move legacy broadcast handling after rematch.
As opposed to other patches in this series, there is a logic change
here. This will send all necessary legacy broadcasts after all
matches have been done.

This should be fine because the callbacks and the broadcasts are
unordered anyway, and the broadcasts are still sent in the same
order as before ; there should not be an observable change from
apps besides some jitter.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: Ibeab8d0a9106c5198228888ac33084238c0a4a1a
2019-11-29 16:59:31 +09:00
Chalard Jean
3892583c07 [NS A12] Move some legacy type tracker handling to a function
It's fine to do this out of the if() clause because :
• If the network newly satisfies a request it is sure to have
  it in the list of requests it satisfies
• If it does not newly satisfy a request and there is still
  a request with a legacy type that it satisfies, then it
  is already remembered by LegacyTypeTracker

As for the VPN, the code always enters the condition anyway.

Test: ConnectivityServiceTest
Change-Id: I8bd668ad27043d6a5036b1b3c52fa5a3146abcfa
2019-11-29 16:59:31 +09:00
Chalard Jean
587758bea6 Add tests for ConnectivityService → BatteryStats messages
Test: ConnectivityServiceTest
Bug: 113554781
Change-Id: I7d3a16be76f606872f8edb84647b9ef94f36cba1
2019-11-29 16:59:30 +09:00
Felix
1397337346 Merge "core/Build: ro.system when comparing fingerprint"
am: 82fee58478

Change-Id: I527f1ff7c5e9dda76ec36dbe6fb1d041e6a36437
2019-11-28 18:45:32 -08:00
Treehugger Robot
82fee58478 Merge "core/Build: ro.system when comparing fingerprint" 2019-11-29 02:36:48 +00:00
Suprabh Shukla
6a509cf4a5 Adding version code R for development
Test: Builds

Bug: 129975435
Change-Id: I26ef76266b2f52746ca08a45f5013c580cecd4fb
Merged-In: I26ef76266b2f52746ca08a45f5013c580cecd4fb
(cherry picked from commit 1d081c503c)
2019-11-28 14:29:12 +00:00
Jeff Gaston
b70885d344 Merge "Replacing @Nullable/@NonNull with @RecentlyNullable/@RecentlyNonNull in non-android APIs"
am: 8c1b66d30e

Change-Id: Ib5452e3f4abc36ccf7019a110b1e99428e9f4d7a
2019-11-28 05:37:03 -08:00
Treehugger Robot
8c1b66d30e Merge "Replacing @Nullable/@NonNull with @RecentlyNullable/@RecentlyNonNull in non-android APIs" 2019-11-28 12:49:17 +00:00