Commit Graph

84905 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
6ce7de5e64 Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13
am: 2d7e53ca90

Change-Id: I709cb6796ed21522d264ea836daad58e987e7839
2019-02-15 16:56:43 -08:00
Remi NGUYEN VAN
2d7e53ca90 Merge "Fix framework and NetworkStack classes conflicts"
am: 3f23efdd13

Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
2019-02-15 16:38:52 -08:00
Remi NGUYEN VAN
3f23efdd13 Merge "Fix framework and NetworkStack classes conflicts" 2019-02-16 00:22:29 +00:00
Remi NGUYEN VAN
0d49d3863b Merge "Move NetworkStack to services.net" am: 762f9f0c24
am: 51490ad0fa

Change-Id: I6a0ddc23bf95039d9d51a4fde9dd87d2f5bf71ee
2019-02-15 03:10:18 -08:00
Remi NGUYEN VAN
51490ad0fa Merge "Move NetworkStack to services.net"
am: 762f9f0c24

Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
2019-02-15 03:01:11 -08:00
Remi NGUYEN VAN
762f9f0c24 Merge "Move NetworkStack to services.net" 2019-02-15 10:52:03 +00:00
Remi NGUYEN VAN
84d7c7e1ef Merge "Remove NetworkMonitor dependency on ICaptivePortal" am: bfe928d593
am: 8a4908c1ab

Change-Id: I60c67a42bce60615f7e0ce86aaafac4fbff19795
2019-02-15 00:34:13 -08:00
Remi NGUYEN VAN
1b57e8e9db Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.

Do the following:
 - jarjar any shared source file between framework and NetworkStack, so
   the version in the NetworkStack uses a different package.
 - Move any shared class not used in the NetworkStack to services.net

The CL  uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.

Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug: 124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
2019-02-15 17:30:07 +09:00
Remi NGUYEN VAN
8a4908c1ab Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am: bfe928d593

Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
2019-02-15 00:26:34 -08:00
Remi NGUYEN VAN
bfe928d593 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00
Remi NGUYEN VAN
7717e58a9f Merge "Remove deps from framework on netd interfaces" am: d36e3df7b0
am: ddd14b357d

Change-Id: If22ad91b285e7a47cc481a8a282b085d5dd53a9d
2019-02-14 19:39:05 -08:00
Remi NGUYEN VAN
ddd14b357d Merge "Remove deps from framework on netd interfaces"
am: d36e3df7b0

Change-Id: I341533244d9c7cd2c1cf8315f0806695310ba03c
2019-02-14 19:29:49 -08:00
Remi NGUYEN VAN
5db454c28d Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib1d08a3669983640119d008db7e2990fa798724f
Merged-In: I501b125a388c1100c2182bde4670944c2f0d7a02
2019-02-15 12:20:17 +09:00
Remi NGUYEN VAN
cfff01e2db Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I8e7bb79e50650ae182a2e4277fb49abf5fb6d910
Merged-In: Ib6a89e54312628662b130fbeec18d11e139f09fa
2019-02-15 12:20:03 +09:00
Remi NGUYEN VAN
d36e3df7b0 Merge "Remove deps from framework on netd interfaces" 2019-02-15 03:11:31 +00:00
Xin Li
07ec9dbec5 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:32 +00:00
Benedict Wong
dee889a825 Merge "Add Test Network and Transport types" am: 0dddb902ae
am: ffd15698c3

Change-Id: I371a4f3bdbbfd001e9694e29843b6b7119b938b0
2019-02-14 10:59:02 -08:00
Benedict Wong
ffd15698c3 Merge "Add Test Network and Transport types"
am: 0dddb902ae

Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264
2019-02-14 10:49:48 -08:00
Benedict Wong
0dddb902ae Merge "Add Test Network and Transport types" 2019-02-14 18:37:04 +00:00
Xin Li
0e71b4f19b DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master

Bug: 124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
2019-02-14 09:48:06 -08:00
Remi NGUYEN VAN
dacee147b4 Remove deps from framework on netd interfaces
If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.

Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I2db9f87b7154130726d4700b241d55b041635d98
Merged-In: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
2019-02-14 17:26:59 +09:00
Jordan Liu
7a39287ca0 Merge "Add UNINITIALIZED and rename INVALID" am: b8493ac5eb
am: aa20ef0836

Change-Id: I2ad19b617f0165e7bcabac567463dfe8f4b175c6
2019-02-13 16:52:32 -08:00
Jordan Liu
aa20ef0836 Merge "Add UNINITIALIZED and rename INVALID"
am: b8493ac5eb

Change-Id: Idd2ef2a91aab0e28743762ea4860b49a02e8389b
2019-02-13 16:30:26 -08:00
Jordan Liu
b8493ac5eb Merge "Add UNINITIALIZED and rename INVALID" 2019-02-14 00:14:11 +00:00
Tianjie Xu
3c4afc34ee Merge "Improved wipe reason information for RecoverySystem" am: c8f5981028
am: 361d379280

Change-Id: I224a98abd065bf5437d4a2ea242f146e91740ef1
2019-02-13 11:55:34 -08:00
Tianjie Xu
361d379280 Merge "Improved wipe reason information for RecoverySystem"
am: c8f5981028

Change-Id: I4da95142ea12593e00ab0d0a44f8e9a0c021596b
2019-02-13 11:43:46 -08:00
Tianjie Xu
c8f5981028 Merge "Improved wipe reason information for RecoverySystem" 2019-02-13 19:18:01 +00:00
Jordan Liu
1f85a3ddf3 Add UNINITIALIZED and rename INVALID
UNINITIALIZED_CARD_ID is for before the card ID is ready.
INVALID_CARD_ID is renamed to UNSUPPORTED_CARD_ID and it is used if the
card ID is known to be unsupported.

Bug: 122978614
Test: atest UiccControllerTest
Change-Id: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
Merged-In: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
2019-02-13 09:54:30 -08:00
Blake Kragten
47552367f4 Merge "Modem power monitor" am: 366318b9c3
am: e66ad835f2

Change-Id: I8753ea8b944c7dfea1fa049f67350a1ce85fd9f7
2019-02-13 09:42:43 -08:00
Blake Kragten
e66ad835f2 Merge "Modem power monitor"
am: 366318b9c3

Change-Id: I85d2b97c40df223106d9a4047b3898d0db3c733e
2019-02-13 09:33:27 -08:00
Blake Kragten
4d3a9f2b3c Modem power monitor
This is an AOSP carry over for the frameworks base CL. This change is needed here to allow telephony changes to be added to AOSP with no issues.

Adding monitored power rail as a new cellular battery stats component. This will be used to better determine actual power usage of the modem rather than relying on battery reduction rates.

If the device does not support rail power monitoring then this value
will always remain at 0.

Test: adb shell dumpsys activity service TelephonyDebugService --metrics
Results Examples:
	Energy consumed by modem (mAh): 2.41

Change-Id: If85af2f2e1b255661e189c5375ecc5825be84c58
2019-02-13 16:02:03 +00:00
Hans Boehm
4e85978e38 Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config" am: 2b56c4cf48
am: e0203aa6ec

Change-Id: I1b96696556a49faab4d003c71e78efda823da193
2019-02-12 21:41:56 -08:00
Hans Boehm
e0203aa6ec Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config"
am: 2b56c4cf48

Change-Id: I0a8554c58710b162df57cbf2ca8dcb7591666ef9
2019-02-12 21:30:19 -08:00
Hans Boehm
2b56c4cf48 Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config" 2019-02-13 05:14:43 +00:00
Po-Chien Hsueh
4ddcd60b84 Merge "Add DynamicAndroidClient" am: fa240e8054
am: 3699ba8e9f

Change-Id: I490f16ea9e123f6828d2e4d31e53fb9471a17f6f
2019-02-12 19:53:03 -08:00
vichang
0865347dac Merge "Include /apex/com.android.runtime for native library in app classloader" am: 9de24de618
am: 8c6c630bcf

Change-Id: I8f8a014446f9d3079a4e78d2010bbd9b4e3f69af
2019-02-12 19:47:58 -08:00
Remi NGUYEN VAN
a7070d3485 Merge "Check NetworkStack UID and perms before binding" am: c96b852f46
am: 89b04a01c2

Change-Id: Ia63a128d2a9d8315d26a3e593b51450ca0fd0c91
2019-02-12 19:31:44 -08:00
Po-Chien Hsueh
3699ba8e9f Merge "Add DynamicAndroidClient"
am: fa240e8054

Change-Id: I05b545489d9fb075a782ee942195011d79bbfbca
2019-02-12 19:02:06 -08:00
vichang
8c6c630bcf Merge "Include /apex/com.android.runtime for native library in app classloader"
am: 9de24de618

Change-Id: I9bcc87b6866695689d31abf7e8e2066158857aba
2019-02-12 18:57:43 -08:00
Remi NGUYEN VAN
89b04a01c2 Merge "Check NetworkStack UID and perms before binding"
am: c96b852f46

Change-Id: Ia9d4718162ed9534c5f61a9be0e8654026b902c8
2019-02-12 18:45:49 -08:00
Yutaro Maruyama
3835f6a4f9 Improved wipe reason information for RecoverySystem
More information will be useful to investigate unintentional wipe
for users. Added timestamp information into reason text.

Bug: 120586954
Change-Id: I26dd4eff815d736bf34e944be6843cbb80515ca9
2019-02-13 10:53:16 +09:00
Po-Chien Hsueh
fa240e8054 Merge "Add DynamicAndroidClient" 2019-02-13 01:20:26 +00:00
vichang
9de24de618 Merge "Include /apex/com.android.runtime for native library in app classloader" 2019-02-13 00:58:37 +00:00
Remi NGUYEN VAN
c96b852f46 Merge "Check NetworkStack UID and perms before binding" 2019-02-13 00:10:18 +00:00
Hans Boehm
573bb79cfb Adjust AsyncTask.THREAD_POOL_EXECUTOR config
Remove the queue, reduce core pool size but no longer let it time out.

Reduce the timeout for additional threads.

If necessary, use a special executor, with an unbounded queue, to run
overflow tasks.

Bug: 123762797
Test: AOSP boots, also with MAXIMUM_POOL_SIZE = 1.
Change-Id: I4bc9593a044d1773ff1878684e2397a7c2a9a87a
2019-02-12 15:43:26 -08:00
Ng Zhi An
1033db8ddf Do not load xml metadata for unchanged packages in RegisteredServicesCache
RegisteredServicesCache caches services in an xml, so the system doesn't
have to scan all the apks. Whenever a package is changed
(add/remove/replaced), the broadcast receiver in RegisteredServicesCache
will refresh this cache by quering all matching services and reading
their
xml metadata. There is extra work done here, because only the changed
package
will have services added/removed.

The edge case is after a cache is invalidated, we want to query package
manager for everything, regardless of what changedUids is (we could
have arrived here if invalidateCache is called, and then a package
change event fires, before a getAllServices is called to rescan
everything).

Add a new test to verify that the optimization takes care of the case
when the cache is invalidated.

Bug: 117755076
Bug: 122912184
Test: atest RegisteredServicesCache
Test: dumpsys content # check sync adapters
Change-Id: I5c1f57108c4b67d24b198000d57216c63d35290a
(cherry picked from commit dc66ef5ed3)
2019-02-12 23:15:52 +00:00
Steven Moreland
a1f96c0af8 Merge "Remove ParcelFileDescriptor.aidl" am: c7c7fe6325
am: 21f4e04f3d

Change-Id: Ibd87a9a61ae70779baa90ced2eaab5526d4d815d
2019-02-12 10:11:54 -08:00
Steven Moreland
21f4e04f3d Merge "Remove ParcelFileDescriptor.aidl"
am: c7c7fe6325

Change-Id: I508f7591ad990d774b7866a831ac84f7a8fb6f77
2019-02-12 10:02:23 -08:00
Steven Moreland
c7c7fe6325 Merge "Remove ParcelFileDescriptor.aidl" 2019-02-12 17:51:35 +00:00
Victor Chang
a366cc8c52 Include /apex/com.android.runtime for native library in app classloader
Bug: 123702996
Test: Manual test. After moving libicuuc.so into the apex path,
  call System.loadLibrary("icuuc") in test app
Test: CtsJniTestCases pass after moving libicuuc into apex and applied
CTS patch here. http://r.android.com/898053

Change-Id: Ic9049c1595b4ea029ec65649c3f3283672744569
2019-02-12 14:53:01 +00:00