763 Commits

Author SHA1 Message Date
Steven Moreland
26190d5536 Merge "NativeHandle.java: set Nullable/NonNull" am: 6792c595a2 am: b5e85d6bb6
am: 927dee8243

Change-Id: I1caab5b13688b9d76e8d6ba59c83e32a6218be7e
2019-03-06 12:47:15 -08:00
Steven Moreland
b5e85d6bb6 Merge "NativeHandle.java: set Nullable/NonNull"
am: 6792c595a2

Change-Id: I09cdb1ce3cc64cb8ca42a13b307b93b5dab8e42c
2019-03-06 12:28:23 -08:00
Steven Moreland
0ff061a607 NativeHandle.java: set Nullable/NonNull
Fixes: 126700972
Test: hidl_test_java
Test: atest android.os.cts.HwBinderTest
Change-Id: Id45c6d0757913014028f7629db78b64f27cad084
2019-03-06 17:17:30 +00:00
TreeHugger Robot
5c73d2a82d Merge "Refactoring and some fixes around TextClassifierService" 2019-03-05 12:20:38 +00:00
Andrei Onea
7a2985c3ca Add target for generating aidl mappings
Test: make aidl-mappings
Change-Id: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
2019-03-04 13:51:36 +00:00
Neil Fuller
458d16bced Merge "Use new libcore filegroup variable"
am: 898caeeaed

Change-Id: Ib5ff380f043b31b45b4b5ef0c9593e456b656378
2019-03-04 04:37:29 -08:00
Neil Fuller
898caeeaed Merge "Use new libcore filegroup variable" 2019-03-04 12:14:59 +00:00
Neil Fuller
cce7b33289 Use new libcore filegroup variable
This change switches frameworks/base/ targets to a generic "interface"
libcore filegroup variable, core_public_api_files, rather than having
it know about Core Library internal filegroups. It is not perfect
because the command line tools need to know to exclude certain packages,
but it is a step in the right direction.

Bug: 126332291
Test: build only
Merged-In: I72667f30dc5685fdc24aca3f8ee82b20c7548449
Change-Id: I72667f30dc5685fdc24aca3f8ee82b20c7548449
2019-02-26 16:19:17 +00:00
Neil Fuller
3b1b70376c Use new libcore filegroup variable
This change switches frameworks/base/ targets to a generic "interface"
libcore filegroup variable, core_public_api_files, rather than having
it know about Core Library internal filegroups. It is not perfect
because the command line tools need to know to exclude certain packages,
but it is a step in the right direction.

Bug: 126332291
Test: build only
Change-Id: I72667f30dc5685fdc24aca3f8ee82b20c7548449
2019-02-26 13:44:43 +00:00
Dirk Dougherty
e62044c92d Merge "For ds-docs build, pass -yamlV2 and -metalavaApiSince." 2019-02-25 22:40:06 +00:00
Paul Duffin
48d535217a Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath" am: b751443fdc am: 064a2fdd20
am: e63bae1c85

Change-Id: I41b5de61a6edee2fa71b36805a4af109179ca4d8
2019-02-25 09:15:24 -08:00
Paul Duffin
e63bae1c85 Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath" am: b751443fdc
am: 064a2fdd20

Change-Id: Ifd6c944b9fa8cea1154eed674c234c473955dff7
2019-02-25 08:38:32 -08:00
Dirk Dougherty
14b05b1cc8 For ds-docs build, pass -yamlV2 and -metalavaApiSince.
These two flags generate the API reference in the
new format expected by DAC.

Test: make ds-docs
Bug: 125939989
Change-Id: I63510051d87b211793ca140ed0fd618d6ebd3f68
2019-02-22 21:07:11 -08:00
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08:00
Tony Mak
9920dbbadf Refactoring and some fixes around TextClassifierService
This change is mainly to address the comment
"TextClassifierService.onDetectLanguage receives a callback but
immediately calls callback.onSuccess before method returns, that is
unexpected behavior. Method should either have a return value or post
callback. Same for onSuggestConversationActions" from API  council.

1. Like other services that allows developers to extend,
   APIs in TextClassifierService are now delivered in the main thread.

2. The default implementation of onDetectLanguage and
   onSuggestConversationActions now run local textclassifier in a worker
   thread. So it won't block the main thread and make sure the callback
   is called after the function returns.

3. Refactor the code so that fewer boilerplate codes around the callback.
   We are now using ITextClassifierCallback to replace all the existing
   I*Callback. This allows us to write template code easily.

BUG: 120841922

Test: Enable system textclassifier tests and run atest TextClassifierTest.java
Test: Manual. Try out smart selection and related features.

Change-Id: I33b2cc80f968fb8b5d5007a153b6e50041e57ce6
2019-02-21 12:15:10 +00:00
Paul Duffin
fab8754054 Allow framework-atb-backward-compatibility to be added to bootclasspath
Fixes a build failure that occurs when it is executed with
REMOVE_ATB_FROM_BCP=true.

Setting REMOVE_ATB_FROM_BCP=true adds the
framework-atb-backward-compatibility target to the PRODUCT_BOOT_JARS
path in place of android.test.base. That causes a problem because the
build expects that everything on the PRODUCT_BOOT_JARS is installable.

Bug: 73711752
Test: make droid and flash both with and without REMOVE_ATB_FROM_BCP=true
Change-Id: I6595ff8dba42e6b85abbf6a6cad4d8970b5a91a0
2019-02-21 10:42:12 +00:00
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