Commit Graph

747 Commits

Author SHA1 Message Date
Tiger Huang
c0240753f0 Remove InputForwarder
InputForwarder was used by ActivityView. InputForwarder is not used by
anyone now.

Bug: 120675821
Test: Manual test with ActivityViewTest
Test: atest CtsActivityManagerDeviceTestCases:ActivityViewTest
Change-Id: I6bd2338c921e6dfb1dfe357decb878d558df8bfd
2019-02-18 20:02:18 +08:00
Remi NGUYEN VAN
33241a394f Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13 am: 2d7e53ca90
am: 6ce7de5e64

Change-Id: I4d943c592ae5c8b27be29857243e62e19c350549
2019-02-15 17:16:33 -08:00
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
3f23efdd13 Merge "Fix framework and NetworkStack classes conflicts" 2019-02-16 00:22:29 +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
bfe928d593 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00
Remi NGUYEN VAN
6616e2ab5d Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 05:39:14 +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
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
Paul Duffin
78e3b2daf6 Merge "Add :frameworks-base-api-current.txt filegroup" am: 5de80df81e am: ceac819b8f
am: 42b7db201b

Change-Id: I61f1e9ce5dddb710059cb8feba16376d9bb99cbe
2019-02-14 05:03:58 -08:00
Paul Duffin
42b7db201b Merge "Add :frameworks-base-api-current.txt filegroup" am: 5de80df81e
am: ceac819b8f

Change-Id: I2bf011e4d2a26cb2094234666c4bd24b1f65e39b
2019-02-14 04:51:23 -08:00
Remi NGUYEN VAN
5a1b74b6d5 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.

(cherry-pick of aosp/904953 with minor conflict in Android.bp)

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib6a89e54312628662b130fbeec18d11e139f09fa
2019-02-14 20:36:40 +09: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
Remi NGUYEN VAN
55b0803ae1 Merge "Remove deps from framework on netd interfaces" 2019-02-14 03:11:32 +00:00
Paul Duffin
36fbee4756 Merge "Use filegroup name not contents in $(location ...)" am: 32bfd77b79 am: 43c0a4eeae
am: 42a34863f1

Change-Id: Icc6498893041aa71a51f825957fd0d815d9e458b
2019-02-13 02:49:47 -08:00
Paul Duffin
42a34863f1 Merge "Use filegroup name not contents in $(location ...)" am: 32bfd77b79
am: 43c0a4eeae

Change-Id: Iffb8150e70c668850be28b467f1d7cd6917ebc26
2019-02-13 02:36:16 -08:00
Remi NGUYEN VAN
f9a8c2e173 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.

(cherry-pick of aosp/903220 with trivial conflict in Android.bp)

Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
2019-02-13 19:34:37 +09:00
Paul Duffin
0440e1fca9 Add :frameworks-base-api-current.txt filegroup
Needed by external/apache-http/Android.bp.

Bug: 119021844
Test: make checkbuild
Change-Id: Iab599d0e85524d2efa0aee9358a602e3da9931ad
2019-02-13 10:26:38 +00:00
Paul Duffin
32bfd77b79 Merge "Use filegroup name not contents in $(location ...)" 2019-02-13 10:12:46 +00:00
TreeHugger Robot
6ff5ad9adf Merge "Remove duplicated classes with framework.jar from updatable-media.jar" 2019-02-13 06:18:16 +00:00
Insun Kang
291318d5f4 Remove duplicated classes with framework.jar from updatable-media.jar
Bug: 111107855
Test: Sucessfully build with aosp/884112
Change-Id: Ic3c93ab395ccfae6150297bf6447043f928a01c5
2019-02-13 11:52:46 +09:00
Steven Moreland
8a17271970 Merge "Remove duplicate networkstack-aidl-interfaces-java" am: 3e141a27c9 am: df3a9f41c4
am: 8eacbb3396

Change-Id: Id30768cf31dd3a416d0a6b6bbac4496a51d0e56e
2019-02-12 11:23:22 -08:00
Steven Moreland
8eacbb3396 Merge "Remove duplicate networkstack-aidl-interfaces-java" am: 3e141a27c9
am: df3a9f41c4

Change-Id: Ia542e16910f9c65fabe22344bbe8e8975a274045
2019-02-12 11:13:15 -08:00
Xiangyu/Malcolm Chen
30a48d7a09 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-02-12 18:40:09 +00:00
Steven Moreland
3e141a27c9 Merge "Remove duplicate networkstack-aidl-interfaces-java" 2019-02-12 18:29:24 +00:00
Paul Duffin
1bf95b0d3d Merge "Remove unused build variable framework_docs_args" am: bbd757d791 am: 662428ca71
am: a03a4a69c6

Change-Id: I6901c48bc1a8aa7c6908d37802e05210acaab204
2019-02-12 10:08:15 -08:00
Paul Duffin
a03a4a69c6 Merge "Remove unused build variable framework_docs_args" am: bbd757d791
am: 662428ca71

Change-Id: I2fb33849674d68de445ba46c3591b473fffb35cb
2019-02-12 09:57:29 -08:00
Paul Duffin
cf2e989220 Use filegroup name not contents in $(location ...)
Bug: 124218911
Test: make checkbuild
Change-Id: I0427ed4c73e4cf06f09b520a886ccf6ed0d150b2
2019-02-12 12:39:42 +00:00
Paul Duffin
e1a3fa5ef8 Remove unused build variable framework_docs_args
Bug: 124218911
Test: make checkbuild
Change-Id: I39c73bc8bee3824161e91967ec187ce60e838b48
2019-02-12 12:39:42 +00:00
Steven Moreland
771478ca17 Remove duplicate networkstack-aidl-interfaces-java
Bug: N/A
Test: N/A
Change-Id: Id34a25e54f742d20e7d451e88d2712c9ed9cdd05
2019-02-11 17:11:54 -08:00
Tej Singh
a0c89dd5b6 Statsd Puller Callback Registration
Creates a hidden api to register puller callbacks for vendor atoms.

Test: manual local test
Test: statsd unit tests
Bug: 119898637
Change-Id: Id28817b8fc718e128adc4e1c6b2e997db84517f9
2019-02-11 14:24:03 -08:00
Malcolm Chen
b2b88b3735 Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.

Bug: 122255288
Test: manual

Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-02-07 19:03:32 -08:00
Neil Fuller
e9c9b092f3 Merge "Revert "Minimum viable TimeZoneDetectorService"" am: 1fe970651f
am: 91145c9a6e

Change-Id: Id3d2d5802a5a68058b4d70e49b02380c55c4a236
2019-02-06 10:32:25 -08:00
Neil Fuller
1fe970651f Merge "Revert "Minimum viable TimeZoneDetectorService"" 2019-02-06 18:02:38 +00:00
Makoto Onuki
db7d1c98a4 Merge "Rename SmsAppService to CarrierMessagingClientService" 2019-02-06 17:01:38 +00:00
Chalard Jean
de626e0520 Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 533b2960fc am: 968c9f495c
am: 66b84e3c44

Change-Id: I700550160c795becb4c3e37a88328488846d272f
2019-02-06 01:47:49 -08:00
Chalard Jean
66b84e3c44 Merge "[KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData" am: 533b2960fc
am: 968c9f495c

Change-Id: I3b0645585140d8ee12f896946a2a1fbb519e6195
2019-02-06 01:38:31 -08:00
junyulai
2ed5d4cf92 [KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I057dde79013b9eda5037b9a44f8eee06cc07352e
2019-02-06 14:07:39 +09:00
Henry Fang
5215ac9d41 Revert "Revert "Add public API to use new interfaces from cas@1.1""
This reverts commit cdcaed6acb.

Reason for revert: <Verified build locally, CL is fine. original issue may be caused by conflict between merges>

Change-Id: Id9707692a704c3d4475aee1f6c580208eb6ab744
Test: Manual
Bug: 122472761
2019-02-04 10:57:38 -08:00
Makoto Onuki
05d64cbc41 Rename SmsAppService to CarrierMessagingClientService
Also rename the permission and the intent action.

Change-Id: I366a136556a42db1eb657dfb8e797ec22b67a5ba
Fix: 123661399
Test: atest CtsAppBindingHostTestCases
2019-02-01 16:10:05 -08:00
Neil Fuller
963fea9056 Revert "Minimum viable TimeZoneDetectorService"
Remove the stubbed TimeZoneDetectorService. Priorities
dictated that it not be worked on so it has never been
used.

This reverts commit 7fb88c3928.

Bug: 112827764
Bug: 78217059
Test: build / boot
Change-Id: I39ed2fc7f8de8d4b2c0d883cd264cc126579af27
Merged-In: I39ed2fc7f8de8d4b2c0d883cd264cc126579af27
(cherry picked from commit f4894d391b)
2019-02-01 13:21:55 +00:00
TreeHugger Robot
2c13539844 Merge "Revert "Minimum viable TimeZoneDetectorService"" 2019-02-01 12:57:32 +00:00
Insun Kang
d5fa8155ec Add updatable_media_stubs to prevent private API use.
Also resolve dependency cycle between framework and updatable-media.

Bug: 123551910, Bug: 123253805
Test: build
Change-Id: I220bc32319b53d77a14b7e9a36ab0faca0003d66
2019-01-31 15:33:41 -08:00
Howard Chen
1906271db6 Merge "Add the DynamicAndroid Service" am: 0b2057db02
am: 683251a1e2

Change-Id: Ia23e042273c8ab1a9d6de5e393b126794822cb5f
2019-01-31 07:11:33 -08:00
Howard Chen
f17f42b0df Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Merged-In: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
2019-01-31 15:10:21 +08:00
Howard Chen
0a94764738 Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
2019-01-31 14:19:34 +08:00
Xusong Wang
72492e27b6 Merge "Revert "Add public API to use new interfaces from cas@1.1"" 2019-01-31 01:00:57 +00:00
Henry Fang
cdcaed6acb Revert "Add public API to use new interfaces from cas@1.1"
This reverts commit 818719dd45.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I595c1949ed139700144f19ee5bd7f91a5f0a1edd
2019-01-31 00:46:05 +00:00