Commit Graph

341 Commits

Author SHA1 Message Date
Nan Zhang
5c31884fdb Merge "Add compatibility check for (system|test_)api-stubs-docs" am: c9b01b87b1 am: 27892305d6
am: 7d11372923

Change-Id: I613d0f35687005f4e2ef1ff26c5d673b44cd5a8a
2018-08-23 02:58:43 -07:00
Treehugger Robot
c9b01b87b1 Merge "Add compatibility check for (system|test_)api-stubs-docs" 2018-08-23 07:33:31 +00:00
Jack Yu
69c8dbb9eb Merge "Added qualified networks services" am: 63de9eabec am: f02b6d6679
am: 507bdec1ab

Change-Id: If60c3165dab5316c17cfe7ba0e5e7d8dab782636
2018-08-22 15:44:55 -07:00
Jack Yu
63de9eabec Merge "Added qualified networks services" 2018-08-22 20:18:11 +00:00
Jack Yu
a3ab5750a4 Added qualified networks services
Added the qualified networks service, which is a base
class for vendor's qualified network service to extend.
The service is to update frameworks the available
networks for data setup for each APN type.

Test: Manual
Bug: 73659459
Change-Id: I7238aeac8e48be2a17245de77239b242703bcb7e
2018-08-21 17:57:57 -07:00
Nan Zhang
cd060d9808 Add compatibility check for (system|test_)api-stubs-docs
Test: m -j api-stubs-docs
Bug: b/78245848
Change-Id: Ia4a337ac464232ac8a5bd054b940a7d7f1f4e213
2018-08-21 10:39:42 -07:00
Pete Gillin
a8ba4c1a5a Merge "Stop reading the generated ojluni sources in droiddoc." am: 8ab61fb0dd am: 493a6bddf1
am: 1d44a65df9

Change-Id: I00155038e50cbe3704f34085f79721d19bdbf534
2018-08-21 09:10:07 -07:00
Pete Gillin
8ab61fb0dd Merge "Stop reading the generated ojluni sources in droiddoc." 2018-08-21 15:14:55 +00:00
Colin Cross
2e68867129 Merge "Convert platformprotosnano and platformprotoslite to Android.bp" am: c465fef277 am: 2f9f6b009d
am: e3eb78dd92

Change-Id: I4f0ea8c51aa0dfadcbd93fa9e553aba536594cf3
2018-08-21 03:42:49 -07:00
Colin Cross
432141676a Convert platformprotosnano and platformprotoslite to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Icfb0001df2e35b5ed799511ff4f2f563d626134b
2018-08-20 13:57:24 -07:00
Pete Gillin
d41686cea5 Stop reading the generated ojluni sources in droiddoc.
These sources contain the result of applying the annotations from
ojluni.jaif to the ojluni sources. Now that ojluni.jaif is empty, this
is a noop, so this change switches back to reading the original
sources.

Bug: 111639530
Test: `make docs` is not affected
Change-Id: Idb98aa4f054a11bfcbcb8a84dd6f357a0a025c49
2018-08-20 17:33:46 +01:00
Nan Zhang
99f168a59a Merge "Add update-api for Metalava based api-stubs-docs" am: 93429e6188 am: cdd38fd98e
am: d116310a14

Change-Id: I7e67f7c0e9581589ffe6d957f2fa791d733ddb2b
2018-08-17 17:15:10 -07:00
Nan Zhang
e561260e59 Add update-api for Metalava based api-stubs-docs
Use check_api section to put the target files which need to be updated.
But check_api doesn't do actually checking work.

Bug: b/112668343
Test: m -j api-stubs-docs-update-current-api
Change-Id: I0f28e6e480413e0ac5cdff51bc4b2df478a867f6
2018-08-17 13:32:14 -07:00
Nan Zhang
dc72ad5218 Merge "Remove api-stubs-docs targets." 2018-08-17 16:53:11 +00:00
TreeHugger Robot
f4aea74d87 Merge "Build android.test.* with java_sdk_library" 2018-08-17 11:14:08 +00:00
Nan Zhang
94763e192f Merge "Use 28.txt as API file for migrating NULLs in Metalava" am: 2495ca3c29 am: 7aa98ce2b0
am: 559898ef33

Change-Id: Id51b64c8afea2a19e3fe2ad2363fd6b234c35825
2018-08-17 02:23:37 -07:00
Nan Zhang
7aa98ce2b0 Merge "Use 28.txt as API file for migrating NULLs in Metalava"
am: 2495ca3c29

Change-Id: I9e1343b1878e73ebb6a83ac4c8a4436d6846baf1
2018-08-17 01:52:21 -07:00
Nan Zhang
1c8219bcdd Use 28.txt as API file for migrating NULLs in Metalava
Use last released API file for annotations reference in master branch
(non-releasing branch).

Test: manual
Bug: b/78245848
Change-Id: I0520231619001032c00d98fdc8cd86aa41f4fa14
2018-08-16 17:10:22 -07:00
Sundong Ahn
f24779c8c7 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
2018-08-16 12:16:28 +09:00
Nan Zhang
c28a0ac77c Remove api-stubs-docs targets.
Since api-stubs-docs will be replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I3d2091afb0b5d93250573076d4dc95b47c634f2d
Merged-In: I3d2091afb0b5d93250573076d4dc95b47c634f2d
2018-08-14 13:46:01 -07:00
Nan Zhang
08070ebd6a Merge "Remove api-stubs-docs targets." 2018-08-14 18:18:16 +00:00
Steven Moreland
bc600d3282 Merge "Implementing support for HIDL native handles in Java" am: 1e1d8d2485 am: 6580802918
am: 4a6566440f

Change-Id: I649a10172d93beae9063ec2170e60aa4967ba0be
2018-08-14 10:16:06 -07:00
Steven Moreland
6580802918 Merge "Implementing support for HIDL native handles in Java"
am: 1e1d8d2485

Change-Id: I5f2f709bcb87174850140e5ca7d4296338c1f56f
2018-08-14 09:54:46 -07:00
Nirav Atre
9850dd9751 Implementing support for HIDL native handles in Java
This change implements the equivalent of the C++ native_handle_t type in
Java. Similar to the C++ type, the NativeHandle class wraps an arraylist
of FileDescriptor objects, along with a raw data stream (integer array).

Bug: 35098567
Test: Ran m, hidl_test (C++ and Java). Functionality tests are included
in a separate CL.

Change-Id: Ic53f9a49ae17ce5708577a586230126ab0e222c7
2018-08-13 14:31:17 -07:00
Pete Gillin
6f85c2f657 Merge "Add libcore/ojluni/annotations as a source for metalava." am: c12090200d am: 31090fa0b3 am: c7f3c56a29
am: 228ee3501f

Change-Id: I24453ca20ab54f1b0327b6a1af60b814c008ed16
2018-08-13 07:59:18 -07:00
Pete Gillin
c7f3c56a29 Merge "Add libcore/ojluni/annotations as a source for metalava." am: c12090200d
am: 31090fa0b3

Change-Id: Ifdc2ab0e8c5e393149c1f3f9860037565f0cf2d6
2018-08-13 07:37:07 -07:00
Treehugger Robot
c12090200d Merge "Add libcore/ojluni/annotations as a source for metalava." 2018-08-13 12:22:29 +00:00
Alex Light
5e11d609c6 Merge "Work around b/70221552" am: f06d3a9857 am: b2432b2ab3 am: 9cd6280f6b
am: 2810a9b852

Change-Id: Ib1d3ba042fba799f9061b74c0f78d77e830be1fd
2018-08-08 20:28:08 -07:00
Alex Light
9cd6280f6b Merge "Work around b/70221552" am: f06d3a9857
am: b2432b2ab3

Change-Id: I07faa9adfd5e6589b9989be6056d994c5909408a
2018-08-08 14:57:25 -07:00
Alex Light
159799d7c9 Work around b/70221552
If one sets a sufficiently long OUT_DIR to build into the
//frameworks/base:framework-javastream-protos generate target will
fail due to trying to run a too-long command. This works around that
problem by making the command being run much smaller.

Test: Build
Bug: 70221552
Change-Id: I0134ccfc83469826d3ea8679e1c52b9b52c6d2e0
2018-08-08 09:52:51 -07:00
Nan Zhang
4d3f501485 Remove api-stubs-docs targets.
Since api-stubs-docs will be replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I3d2091afb0b5d93250573076d4dc95b47c634f2d
2018-08-07 16:16:50 -07:00
Pete Gillin
c8cbb36673 Add libcore/ojluni/annotations as a source for metalava.
This adds the new annotations (in Java stub format) to the list that
metalava will merge when building stubs.

Bug: 111639530
Test: `make metalava-api-stubs-docs`
Change-Id: I5e73d1276f0602bd14a41f7a64659b1a7b1347cf
2018-08-07 16:49:08 +01:00
Nan Zhang
80c65f4314 Merge changes from topic "offlinesdk-docs" am: 003f49cf0c am: 7e1e76a6dc am: bd2aeeea3b
am: 8d3cf3253f

Change-Id: I8b72e1fa8dce81f65366136fb807879a9894a7af
2018-08-06 22:32:23 -07:00
Xin Li
77cb283f93 Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240 am: 86983ac0a8
am: c8ae454bfd

Change-Id: I6318c7081069dc2df41420a00d2378078d86a463
2018-08-06 21:33:10 -07:00
Nan Zhang
bd2aeeea3b Merge changes from topic "offlinesdk-docs" am: 003f49cf0c
am: 7e1e76a6dc

Change-Id: I43a6d15e11e8ff4d79ceea3d6530c2899ec849ed
2018-08-06 19:09:21 -07:00
Nan Zhang
7e1e76a6dc Merge changes from topic "offlinesdk-docs"
am: 003f49cf0c

Change-Id: Ie2869c671faab24bfc4f426261e4d079d0f3b5de
2018-08-06 18:54:35 -07:00
Nan Zhang
d9cb1b429a Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs"
am: f8e12c51d4

Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f
2018-08-06 18:30:35 -07:00
Xin Li
86983ac0a8 Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master
am: d18450d240

Change-Id: I61802a7c65b27283f34576a561ba9724ad4e11ed
2018-08-06 18:11:13 -07:00
Xin Li
d18450d240 Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master 2018-08-06 17:56:04 -07:00
Nan Zhang
003f49cf0c Merge changes from topic "offlinesdk-docs"
* changes:
  Add more libs for framework docs generation
  Add offline/online-sdk-docs in Soong.
2018-08-07 00:05:27 +00:00
Nan Zhang
dbc253143b Add more libs for framework docs generation
These two libs are not in the default libs which caused droiddoc report
lots of "package not found warning" when generating offline/online docs.

Test: m -j ds-static-docs
Bug: b/70351683
Change-Id: Ibb1f5e1817895abb1b711dc537493bd93c77077b
2018-08-02 16:29:43 -07:00
Nan Zhang
c3ce78d660 Add offline/online-sdk-docs in Soong.
Since support libraries have been migrated to Soong, these docs modules
currently are ready to be supported in Soong.

Bug: b/70351683
Test: m -j offline-sdk-docs
Change-Id: I8739d94909c7cc830c30fa3d1047d26761cc5076
Merged-In: I8739d94909c7cc830c30fa3d1047d26761cc5076
2018-08-02 12:16:45 -07:00
Nan Zhang
e379f40893 Depend on a module instead of real dir for metalava_merge_annotations_dirs
Bug: b/111916275
Test: touch manual/android/support/design/widget/annotations.xml, and m
-j metalava-api-stubs-docs, and check the built output srcjar.

Change-Id: I82e8b51d66f97ebc3f9f4f5aa75ce33066c95089
2018-08-01 22:19:48 +00:00
Bernardo Rufino
f3b8c6fe3a Merge "[KV] State machine to linear task w/ RemoteCall" 2018-08-01 17:56:27 +00:00
Nan Zhang
06a97144fb Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master
am: 2a924543f6

Change-Id: I4572932dfa398a771a2f4a7c84ecfd2e577a7a19
2018-07-31 15:39:55 -07:00
Nan Zhang
2a924543f6 Merge "Add offline/online-sdk-docs in Soong." into stage-aosp-master 2018-07-31 22:14:41 +00:00
TreeHugger Robot
6928e50c26 Merge "Frameworks: convert platformprotos to soong" into stage-aosp-master 2018-07-30 20:30:35 +00:00
Bernardo Rufino
2d87f453d9 [KV] State machine to linear task w/ RemoteCall
This is the first CL of key-value backup refactor.

* Method execute() that executed the state machine states is now empty
  and run() is created with the initial version of the linear task. It's
  basically composed of begin + loop + end. Although it still has the notion
  of state, it's more restricted than before (with private methods returning
  the next state). This is intentional to avoid making this CL too heavy to
  review and to avoid too much behavioral changes here. In the next CLs I
  intend to remove BackupState.

* Introduction of RemoteCall, which encapsulates an outbound call that
  leaves the system_server, with time-out and cancellation built-in.
  Agent calls are now triggered using this. As a result there is no more
  operationComplete() method either.

* Cancellation now is cleaner. We don't need a step lock anymore, only a
  (volatile) boolean that is checked in every queue iteration. If asked
  to cancel during an ongoing agent call we rely on RemoteCall.cancel()
  to return control of the task thread to us. We wait for the cancel
  acknowledgement to preserve the contract of no more transport calls.

* PFTBT instantiation moved from the constructor to the run() method,
  which makes more sense.

* No need for mFinished, mBackupData == null bookkeeping since time-outs,
  cancellation and legitimate agent responses won't step into one another
  anymore.

* Ternary (mQueue.isEmpty) ? BackupState.FINAL : BackupState.RUNNING_QUEUE gone
  because we check this in the beginning of invokeNextAgent() and now we
  don't pay the state-machine tick price associated with the handler.

* PerformBackupTask call sites now call static method start(), that
  spins up a new dedicated thread for the task. This new thread is
  assigned the same (process) priority as the backup thread
  (THREAD_PRIORITY_BACKGROUND).

Work left for future CLs:

* RemoteCall spins up a new thread for kicking off the call, this is for
  system agents that are executed inline. Old PBT also executed in the same
  thread (backup handler thread), so maintaining this to keep this CL at
  a reasonable size.

Test: atest PerformBackupTaskTest
Test: atest RunFrameworksServicesRoboTests
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/backup
Test: atest CtsBackupTestCases
Test: atest CtsBackupHostTestCases
Test: atest GtsBackupTestCases
Test: atest GtsBackupHostTestCases
Test: adb shell bmgr backupnow <kv_packages>
Test: 1. adb shell bmgr backup <p1> <p2>
      2. adb shell bmgr run
      A) 3. Cancel while sending <p1> data to transport
         4. Verify <p1> is backed-up and not pending
	    Verify <p2> is not backed-up and is pending
      B) 3. Cancel while waiting for <p1> agent
         4. Verify <p1> is not backed-up and is pending
	    Verify <p2> is not backed-up and is pending

Change-Id: Ia456c4e807de95d662c9e923245be07e8996f58a
2018-07-30 17:04:02 +01:00
Roshan Pius
2866912853 Merge "WifiManager: Add callback for traffic poller" 2018-07-27 18:24:48 +00:00
Nan Zhang
0b015de77e Merge "Revert "Revert "Add offline/online-sdk-docs in Soong.""" into pi-dev-plus-aosp
am: db994e2827

Change-Id: I4b7532dd1fa59a2ab46070255f4dad46b81d8b33
2018-07-26 14:33:25 -07:00