Commit Graph

321 Commits

Author SHA1 Message Date
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
TreeHugger Robot
db994e2827 Merge "Revert "Revert "Add offline/online-sdk-docs in Soong.""" into pi-dev-plus-aosp 2018-07-26 20:01:47 +00:00
Nan Zhang
3e15ba88ec Revert "Revert "Add offline/online-sdk-docs in Soong.""
This reverts commit 3c47f131d3.

Reason for revert:
Add offline/online-sdk-docs in Soong, attempt 2.

This is the second attempt to merge this CL topic.
The first attempt failed because <sdk.atree failed to find docs/*.txt files>.
This CL fixes this by <go/ag/4636078, go/ag/4636072>

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: I338abfcfd3a15ce54436732f0d70c693a7e063c5
2018-07-26 19:10:03 +00:00
Olivier Gaillard
403b113f0a Merge "Enable generating Binder#getTransactionName method." am: 3134def524 am: d9a8e834dd am: 8ffca7e22a
am: 127ac77c32

Change-Id: I16cdfe3102d46223f92544fe6325298bff3e6224
2018-07-26 07:54:45 -07:00
Olivier Gaillard
8ffca7e22a Merge "Enable generating Binder#getTransactionName method." am: 3134def524
am: d9a8e834dd

Change-Id: I5e36a3db8bcf94aaac1376a9ca9bf5032e25eec2
2018-07-26 07:31:35 -07:00
Olivier Gaillard
d9a8e834dd Merge "Enable generating Binder#getTransactionName method."
am: 3134def524

Change-Id: I5dcdceb1d1e4525576ac21a2bba964dfb6bb0006
2018-07-26 07:20:50 -07:00
Olivier Gaillard
b0ea421351 Enable generating Binder#getTransactionName method.
Test: manual
Bug: 111791983
Change-Id: I68090e6fa5a7876b1e878d0b97807856e3053b36
2018-07-26 11:58:42 +01:00
Nan Zhang
2d1e434080 Merge "Revert "Add offline/online-sdk-docs in Soong."" into pi-dev-plus-aosp
am: 43aaf50aab

Change-Id: I948aee57a0551e455826f2e58922c8ec6f8e18c4
2018-07-25 21:11:47 -07:00
Nan Zhang
43aaf50aab Merge "Revert "Add offline/online-sdk-docs in Soong."" into pi-dev-plus-aosp 2018-07-26 03:59:08 +00:00
Wale Ogunwale
590c716f8c Merge "Moved URI grants code out of ActivityManagerService to its own service (13/n)" 2018-07-26 03:56:08 +00:00
Nan Zhang
3c47f131d3 Revert "Add offline/online-sdk-docs in Soong."
This reverts commit 2d81effc15.

Reason for revert: <broke the sdk target>

Change-Id: I3b7c7f291723789a9bd232b133af9737df6e7967
2018-07-26 02:18:25 +00:00
Nan Zhang
e9a76f7317 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-07-25 17:42:36 -07:00
Andreas Gampe
37b0763a70 Frameworks: convert platformprotos to soong
(cherry picked from commit af27bf6662)

Bug: 64328974
Test: m
Merged-In: I3729a3132c1ef07dded69801373edf51006fa623
Change-Id: I3729a3132c1ef07dded69801373edf51006fa623
2018-07-25 17:35:35 -07:00
Nan Zhang
87fb33d404 Merge "Add offline/online-sdk-docs in Soong." into pi-dev-plus-aosp
am: f3a585475e

Change-Id: I64475c83600439f656c34aaa521f5050fe7b73fe
2018-07-25 17:21:53 -07:00
TreeHugger Robot
f3a585475e Merge "Add offline/online-sdk-docs in Soong." into pi-dev-plus-aosp 2018-07-26 00:06:39 +00:00
Olivier Gaillard
fdf49451a7 Merge "Disable generating Binder#getTransactionName." am: 9119e2e49d am: 6722abdede am: 2def56fa8e
am: 877d58985d

Change-Id: I5e45762a7ef6a59e4bef61ac1394e8fc57d34d73
2018-07-25 15:32:22 -07:00
Olivier Gaillard
2def56fa8e Merge "Disable generating Binder#getTransactionName." am: 9119e2e49d
am: 6722abdede

Change-Id: Ie1016f24f6d3ff6a97b2e827215730d1dc6dec41
2018-07-25 15:06:56 -07:00
Nan Zhang
2d81effc15 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
2018-07-25 14:32:46 -07:00
Olivier Gaillard
6722abdede Merge "Disable generating Binder#getTransactionName."
am: 9119e2e49d

Change-Id: Ic2a31bee9e6768c227dd6de8e2500e9e13f77ecf
2018-07-25 13:36:45 -07:00
Pete Gillin
cfe95a13dd Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65ad3 am: c2b639218e am: d12b7f790d
am: 9afc75d604

Change-Id: I749d8e74403a91794526a91c6b538e8ed49113f4
2018-07-25 10:51:27 -07:00
Pete Gillin
d12b7f790d Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65ad3
am: c2b639218e

Change-Id: Iafe5f91b31e00d171ef50360adb3cb90c0128ddf
2018-07-25 10:25:28 -07:00