Commit Graph

783 Commits

Author SHA1 Message Date
Mingguang Xu
e05b0ec4da Merge "Wifi usability: Comments from API review council are addressed" 2019-03-12 18:21:08 +00:00
TreeHugger Robot
9b9406f8c1 Merge "Use a boolean Consumer instead of RoleManagerCallback." 2019-03-11 17:22:40 +00:00
Benedict Wong
44faad3e22 Merge "resolve merge conflicts of 836402e0e8 to master" 2019-03-09 08:37:00 +00:00
Sooraj Sasindran
153a235d10 Merge "Modify API return type and add callback." 2019-03-09 05:44:06 +00:00
Mingguang Xu
e77cabc488 Wifi usability: Comments from API review council are addressed
Addressed all comments from API review council:
1. Rename WifiUsabilityStatsListener to OnWifiUsabilityStatsListener.
2. Change the modifier of member variables in WifiUsabilityStatsEntry.java to private and use getters.
3. Document the unit of predicitonHoirzonSec and its expected range.
4. Add @ProbeStaus in probeStatusSinceLastUpdate.
5. Rename probeElapsedTimeMsSinceLastUpdate to
ProbeElapsedTimeSinceLastUpdateMs.
6. Marked @NonNull for Argument 3 in onWifiUsabilityStats.

Bug: 126391553
Bug: 126699865
Bug: 113262380

Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I20d9ad05dc0bb537b09006ca44a447401b3e1001
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
2019-03-08 17:24:27 -08:00
Hai Zhang
f5e8ccd88f Use a boolean Consumer instead of RoleManagerCallback.
And use RemoteCallback for it under the hood. This removes one AIDL
interface and allows using lambda, while aligning with what
PermissionControllerService does.

Bug: 127691087
Test: manual
Change-Id: Ia94e5bac59773380b2a4764d766bf6ff1dd5b7ff
2019-03-08 15:51:02 -08:00
Benedict Wong
18a4ebb257 resolve merge conflicts of 836402e0e8 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
2019-03-08 23:45:49 +00:00
TreeHugger Robot
d1bd765392 Merge "Add RoleControllerManager for role controller service." 2019-03-08 21:32:00 +00:00
Benedict Wong
788be6d63a Merge changes Ie66ba631,Ic42c09a3
am: cbc409986d

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
2019-03-08 06:35:04 -08:00
Xiangyu/Malcolm Chen
7a2dd73329 Merge "Adding callback for setPreferredDataSubscriptionId."
am: 442084c722

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
2019-03-08 06:19:31 -08:00
Andrei Onea
c1d180cd7b resolve merge conflicts of 04e04516b4 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
2019-03-08 13:26:28 +00:00
markchien
6ea3454f07 Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.

Bug: 125583822
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
2019-03-08 17:28:33 +08:00
Hai Zhang
a4959e569d Add RoleControllerManager for role controller service.
This allows us to expose both system-only and app available APIs for
role in RoleControllerService.

Bug: 127691087
Test: manual
Change-Id: I86fe3736fc28516aae25d48efe3ba599ffdf45d5
2019-03-07 21:33:12 -08:00
danielwbhuang
1f2850c472 Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-08 12:30:15 +08:00
Benedict Wong
cbc409986d Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Andrei-Valentin Onea
04e04516b4 Merge "Add target for generating aidl mappings" 2019-03-07 16:31:14 +00:00
Malcolm Chen
fd11df2924 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
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-03-06 14:54:41 -08:00
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
ae93c8b46f Add target for generating aidl mappings
Test: make framework-aidl-mappings
Change-Id: I8a6e2c876a9569477e2919d437ab6684799a029f
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
2019-03-04 16:05:26 +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
Benedict Wong
e40eab608a Add shell TestNetworkManager and Service
This adds the scaffolding for TestNetworkManager and TestNetworkService.
These are separate from the ConnectivityManager/ConnectivityService in
order to prevent polluting the API space, and making them harder to
maintain.

Bug: 72950854
Test: Compiles, CTS tests relying on this pass
Change-Id: Ic42c09a33d962471e2587ec27f3fab2d72bbcd42
2019-02-28 21:46:58 -08: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