Commit Graph

443854 Commits

Author SHA1 Message Date
Automerger Merge Worker
43bfaf2fda Merge "Fix Race Condition" am: 1d9f60bccc
Change-Id: Ia13cbf8e1afa085c09883a049d375c2916021525
2020-02-25 03:58:54 +00:00
Treehugger Robot
1d9f60bccc Merge "Fix Race Condition" 2020-02-25 03:49:42 +00:00
Automerger Merge Worker
bb0fc42dc1 Merge "Build framework-tethering against module_current" am: 6deeff3406
Change-Id: Id71eb0881f89da751cda6e11fe9019452d7b8ca9
2020-02-25 03:49:31 +00:00
Mark Chien
6deeff3406 Merge "Build framework-tethering against module_current" 2020-02-25 03:28:26 +00:00
Automerger Merge Worker
5af88927d8 Merge "test: LinkProperties: Unique Route Destinations" am: 1ed2876c10
Change-Id: I9261a5e5f6b18390aac34cd25337f211b19a7641
2020-02-25 00:46:25 +00:00
Lorenzo Colitti
1ed2876c10 Merge "test: LinkProperties: Unique Route Destinations" 2020-02-25 00:34:07 +00:00
Automerger Merge Worker
a48f383782 Merge "Re-expose raw data roaming state" am: efa17d986e
Change-Id: Idf670452a33814c760244217303069ba8c9add09
2020-02-24 23:46:44 +00:00
Sarah Chin
efa17d986e Merge "Re-expose raw data roaming state" 2020-02-24 23:35:22 +00:00
markchien
ea39018da1 Build framework-tethering against module_current
Test: build
Change-Id: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
2020-02-25 00:22:44 +08:00
Automerger Merge Worker
026c077b36 Merge "Add DSU default userdata partition size" am: 59d40857ad
Change-Id: I90d675f1ff0426c751b77442c6ce1c6e09fe6c72
2020-02-24 09:26:22 +00:00
Yo Chiang
59d40857ad Merge "Add DSU default userdata partition size" 2020-02-24 09:11:58 +00:00
Yo Chiang
f41e145480 Add DSU default userdata partition size
Use DEFAULT_USERDATA_SIZE as userdata partition size if the calling
Intent desn't specify the userdata size or the specified size is zero.

Bug: 145891687
Test: adb shell am start-activity \
  -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
  -a android.os.image.action.START_INSTALL \
  -d file:///storage/emulated/0/Download/aosp_arm64-dsu_test.zip

Change-Id: I52767dfefef394403c5e16fcfd40792b14ff9a71
2020-02-24 15:06:56 +08:00
Automerger Merge Worker
fc63250a1a Merge "Support losing the upstream in IpServerTest." am: 8a6562112a
Change-Id: Ic865134a7e8ccfa11585c200a6cde5b5e3e7431f
2020-02-23 10:42:08 +00:00
Lorenzo Colitti
8a6562112a Merge "Support losing the upstream in IpServerTest." 2020-02-23 10:18:02 +00:00
Automerger Merge Worker
c648a4ebd0 Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b40158
Change-Id: Ie9a1ae8d778d8843cdcb7dd678aa8acafcac159f
2020-02-23 04:02:38 +00:00
Amy Zhang
1803b40158 Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" 2020-02-23 03:49:51 +00:00
Automerger Merge Worker
b42dfed0f4 Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c
Change-Id: Id8571a8db96770cd699a71c5fcb50fb58c8e511b
2020-02-22 15:30:26 +00:00
Joshua Duong
b9f266d97c Merge "[adbwifi] Make AdbManager changes for adb over WiFi." 2020-02-22 15:18:38 +00:00
Automerger Merge Worker
00f848a922 Merge "Remove liblog from Tethering jni_libs" am: 044edce140
Change-Id: Ia3d3ba3b8740309fd0b213af1ac00ddb2685ce45
2020-02-22 11:56:31 +00:00
Treehugger Robot
044edce140 Merge "Remove liblog from Tethering jni_libs" 2020-02-22 11:38:09 +00:00
Joshua Duong
6f3aaaa5f7 [adbwifi] Make AdbManager changes for adb over WiFi.
This CL has a couple of notable changes:
- Add communication layer between adbd, system server, and Settings UI
- Add system notification (Wireless debugging connected) when at least
  one device is connected.
- Add trusted networks (BSSID) to the keystore.
  - Changed the keystore format to:
    <keyStore version="1">
    <adbKey ... />
    <wifiAP ... />
    </keyStore>
 - Currently, trusted networks don't have a expiration time. Also, only
   way to clear it is by blowing up the keystore (revoke permissions).
- Add pairing mechanism:
  - Using libadbwifi_pairing_connection C++ library to pair a device
    using SPAKE2 protocol over TLS.
  - Register MDNS service for client discovery.
- Removed ability to ctl.start/stop adbd from UsbDeviceManager
  - AdbService now controls when to do this

Bug: 111434128, 119490154, 119492574

Test: Manual. From developer options:
1) USB debugging off, WiFi Debugging off
- Ensure both transports are disabled by trying to connect via WiFi and
USB.
2) USB debugging on, WiFi Debugging off
- Connections via USB are available, WiFi is disabled
3) USB debugging off, WiFi Debugging on
- Connections via WiFi are available (IP + port), USB is not available
4) USB debugging on, WiFi Debugging on
- Check both transports work

Change-Id: I9f87679d195da99a55b6faf7131da1f1af65fe01
Merged-In: I9f87679d195da99a55b6faf7131da1f1af65fe01
Exempt-From-Owner-Approval: already approved
2020-02-22 01:37:05 +00:00
Amy
ec8c2df33b Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context
Test: manual
Bug: 147380513
Change-Id: Id026b59bcec4a1ead9aa7ba900e72ee074c7ef81
Merged-In: Ifedc4e6f120e711aadffdf715d8720e0b64fbe16
2020-02-21 23:33:38 +00:00
Colin Cross
bbe126cf5a Remove liblog from Tethering jni_libs
Tethering's JNI libraries use the NDK version of liblog, it should
not package the platform version of liblog into the APK.

Bug: 149591340
Test: m checkbuild
Change-Id: If208c1078d2755907f57d7853a5c545bf12458c2
2020-02-21 14:49:40 -08:00
Automerger Merge Worker
96c4a23176 Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" am: b3a20cbfff
Change-Id: I4d7346e1f28cc5ca91838199da05c6c7c5536f72
2020-02-21 22:23:21 +00:00
Sarah Chin
78babb4ba9 Re-expose raw data roaming state
Re-expose raw data roaming state from modem
Revert logic in getDataRoamingFromRegistration and make @SystemApi

Test: atest ServiceStateTest, ServiceStateTrackerTest
Bug: 146000674
Change-Id: Ibe52c06a4a42bce0f83548355907459a5b152d9a
Merged-In: Ibe52c06a4a42bce0f83548355907459a5b152d9a
2020-02-21 22:09:49 +00:00
Sarah Chin
b3a20cbfff Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" 2020-02-21 22:09:16 +00:00
Automerger Merge Worker
1da820d954 Merge "Revert "Cache binder calls in CompatChanges"" am: e879968fbf
Change-Id: I2fd44d5f95c66d57c8cf779a8b18a10b4e2e965c
2020-02-21 19:25:51 +00:00
Anna Trostanetski
e879968fbf Merge "Revert "Cache binder calls in CompatChanges"" 2020-02-21 19:13:09 +00:00
Anna Trostanetski
9c6ecc90c5 Revert "Cache binder calls in CompatChanges"
Reason for revert: cache needs to be cleared on package install.
This is much simpler to do in internal master with recent changes
(ag/10172190) so I'm reverting the cache from aosp to keep it correct,
and cherrypicking this into internal master.

Change-Id: I71757a5b60fbdba3c69322b95a20527a1e3a66e9
2020-02-21 16:38:32 +00:00
Automerger Merge Worker
e8f538b03a Merge "Use exposed permission defintion in Tethering" am: f1a0c3abea
Change-Id: I1cf7f1077687f6a7cad2f4d0d6a99d9091bf0a37
2020-02-21 11:37:51 +00:00
Treehugger Robot
f1a0c3abea Merge "Use exposed permission defintion in Tethering" 2020-02-21 11:27:17 +00:00
Lorenzo Colitti
fe9b61dac5 Support losing the upstream in IpServerTest.
Allow dispatchTetherConnectionChanged to pass in a null
upstream interface and/or null LinkProperties. This will allow
future tests to check what happens when the upstream interface
goes away.

Test: test-only change
Change-Id: I7cfc32d072f23644159d33700d6cd830c426ea19
2020-02-21 20:23:59 +09:00
Automerger Merge Worker
5c7bc2062f Merge "Cleanup framework-all usage" am: 38ca6040ea
Change-Id: Ibd572914f2fefc2883d8514cc0a999d957cd2af3
2020-02-21 11:14:22 +00:00
Anton Hansson
38ca6040ea Merge "Cleanup framework-all usage" 2020-02-21 10:59:55 +00:00
Chiachang Wang
96ca8e9fff Use exposed permission defintion in Tethering
The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Change-Id: Ib7f2aedfaaa909bbc356196114c62af9345f2593
2020-02-21 17:50:18 +08:00
Automerger Merge Worker
c53b4accde Merge "Remove useless thread checks" am: 269d32a0fa
Change-Id: I1dc9ce4e5ef5ca2012264fdb736606a36f20c8a3
2020-02-21 09:37:21 +00:00
Treehugger Robot
269d32a0fa Merge "Remove useless thread checks" 2020-02-21 09:22:15 +00:00
Chalard Jean
66257d5cb8 Remove useless thread checks
Because we liked to be really sure.

Test: ConnectivityServiceTests
Change-Id: I8d66257777d4c5b6ca097a5f2575d0872fae05dd
2020-02-21 17:00:49 +09:00
Automerger Merge Worker
00255195fc Merge "Dynamically include ike-stubs in services.core.unboosted" am: 1586327498
Change-Id: Ief6e7d683a39233302773a002f49df6368fb03f5
2020-02-21 06:33:53 +00:00
Yan Yan
1586327498 Merge "Dynamically include ike-stubs in services.core.unboosted" 2020-02-21 06:22:48 +00:00
evitayan
78ed90270a Dynamically include ike-stubs in services.core.unboosted
Previously because compilation will preferentially uses the
ike-stubs statically included in framework.jar,
FrameworksIkeTests has to jarjar the ike_test.jar. Otherwise
the tests will use the ike-stubs and cannot access to the hidden
implementation.

This commit removes ike-stubs in framework-minus-apex and framework
and statically includes it in services.core.unboosted.

In this way, system server can still compile against ike.jar and
at the same time FrameworksIkeTests does not need to jarjar the
ike_test.jar anymore

Bug: 145995723
Test: build, flash, boot, loaded in system server
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Change-Id: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
Merged-In: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
2020-02-21 06:22:12 +00:00
Automerger Merge Worker
4579ab30c3 Merge "Fix VerificationActivity Intent" am: b2d41e93f8
Change-Id: Ie9e153c83afae642e7322c27a1f7e179ab1575e6
2020-02-21 06:05:00 +00:00
Treehugger Robot
b2d41e93f8 Merge "Fix VerificationActivity Intent" 2020-02-21 05:51:24 +00:00
Automerger Merge Worker
bdf898ab9f Merge changes from topic "adbwifi-base" am: 458a9a2561
Change-Id: I03540566fe4eb10926f97c56adf3b0b1449ad89a
2020-02-21 05:24:09 +00:00
Automerger Merge Worker
f41fdc9524 [adbwifi] SysUI: Add WifiDebuggingActivity. am: 9a8ddc9cde
Change-Id: Iceb77b783fdea704019fae8419b4f52a2810e918
2020-02-21 05:24:03 +00:00
Joshua Duong
458a9a2561 Merge changes from topic "adbwifi-base"
* changes:
  Add Settings.Global.ADB_WIFI_ENABLED.
  [adbwifi] SysUI: Add WifiDebuggingActivity.
2020-02-21 05:02:49 +00:00
Yo Chiang
f8d6789233 Fix VerificationActivity Intent
VerificationActivity crashes when the Intent sent to it doesn't have an
extras Bundle. This is because VerificationActivity copies the incoming
Intents extras Bundle with getExtras() / putExtras(Bundle), and
putExtras(Bundle) doesn't expect a null Bundle.

Bug: 145891687
Test: adb shell am start-activity \
  -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
  -a android.os.image.action.START_INSTALL \
  -d file:///storage/emulated/0/Download/aosp_arm64-dsu_test.zip

Test: Dynamic system service mustn't crash
Change-Id: I111641f366d50d739b922bcc3a52993c44212759
2020-02-21 04:17:51 +00:00
Joshua Duong
a71c97f440 Add Settings.Global.ADB_WIFI_ENABLED.
ADB_ENABLED historically meant the state for USB debugging. Since
wireless debugging can be enabled separately, define another setting
for it.

BUG: b/111434128

Test: make
Change-Id: If3abca8e77381d6832f55d55a43c52ee1a1267d1
Merged-In: If3abca8e77381d6832f55d55a43c52ee1a1267d1
Exempt-From-Owner-Approval: cherry-pick
2020-02-20 18:42:14 -08:00
Joshua Duong
9a8ddc9cde [adbwifi] SysUI: Add WifiDebuggingActivity.
This will prompt the user whether they trust the current wireless access
point when enabling wireless debugging.

Bug: 147814644

Test: make
Change-Id: I56a7c022f26d4e3d93a22d9022f19f1b8d997d70
Merged-In: I56a7c022f26d4e3d93a22d9022f19f1b8d997d70
Exempt-From-Owner-Approval: cherry-pick
2020-02-20 18:41:53 -08:00
Sarah Chin
30a3111db8 Expose getLteOnCdmaMode as isGlobalModeEnabled
Rename and make @SystemApi

Test: atest FrameworksTelephonyTests
Bug: 147335742
Change-Id: I2c5727bcc5fd0263acfe669177f43fda17650f41
Merged-In: I2c5727bcc5fd0263acfe669177f43fda17650f41
2020-02-20 16:55:02 -08:00