Commit Graph

1292 Commits

Author SHA1 Message Date
smain@google.com
689dc4a1fe remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
am: 7dd9749246

Change-Id: I112bec6d8618a116c8abab0751849e12253e298c
2016-09-06 18:13:01 +00:00
smain@google.com
343e96ccac switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build.
am: 534bfe1a4a

Change-Id: Ie221252d7cc058d118ac53f3c74ea9c62a077536
2016-09-06 18:08:10 +00:00
smain@google.com
7dd9749246 remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
Change-Id: Ic1778b6e3044c80e602f5ce9d4f825c8578c1a0a
2016-09-02 18:10:29 -07:00
smain@google.com
9971e25056 resolve merge conflicts of dde8deb to nyc-dev-plus-aosp
Change-Id: I5581b6a4b27ec78b8610f2911896b17a710dbd19
2016-09-02 10:53:11 -07:00
smain@google.com
534bfe1a4a switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev.
also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build.

Change-Id: Iebd9791305479c5dc406ba3b81eaf076855bc632
2016-09-01 19:57:42 -07:00
Colin Cross
0903ecb99b Merge "Fix missing dependency on R.java" am: 227a176508
am: bfd4422060

Change-Id: I2090c1f16e77164d82d4e4f99f478315a81f0fc3
2016-09-01 05:47:53 +00:00
Colin Cross
c558dd9597 Fix missing dependency on R.java
Compiling frameworks source is missing a dependency on the R.stamp file
generated by the frameworks-res aapt rule, likely caused by the switch
to jack.  Use LOCAL_ADDITONAL_DEPENDENCIES to insert the dependency
instead of directly using build system internals.

Change-Id: Ifb830da18b3607f87ae283cea04f7d276d4bfde9
2016-08-31 18:01:06 -07:00
Jakub Pawlowski
9f341e4e49 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
2016-08-31 18:21:00 +00:00
Jakub Pawlowski
a480f7fe28 Separate advertiser from GATT client (1/4)
Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad
2016-08-31 03:36:53 -07:00
smain@google.com
dde8deb950 replace the N Preview landing page with the redirect to the package index
also update version metadata (no longer preview, now 7.0)

Change-Id: I84af003daa9bae3bc932c8b87921ed82f813e1cf
2016-08-30 20:42:12 +00:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Etan Cohen
00abb43588 [NAN] Renamed listeners to callback per API guidelines
The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

(cherry-pick of 0d0f0c7faf,
 Change-Id: Ib12711f56a64052455843859125d72268c465fc0)

Bug: 27122760
Change-Id: Ie1905a5d907e5b09d449af52814b1aacb6426477
(cherry picked from commit 4e1af1b807)
2016-08-26 13:18:55 -07:00
Etan Cohen
b29bbcc54c [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config
Simplify configuration and consolidate structures whose difference
wasn't very clear.

(cherry-pick of e4c50de752,
 Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de)

Bug: 27122760
Change-Id: I6320bd4c960e4473b4bf3c28e54a7ba492fa2cf9
(cherry picked from commit 581a4f7b31)
2016-08-26 13:18:54 -07:00
Dirk Dougherty
1d7e5a6998 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am: b042ab1eb6

Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
2016-08-17 23:25:38 +00:00
Dirk Dougherty
b042ab1eb6 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
2016-08-16 16:28:20 -07:00
smain@google.com
38b71c5741 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am: 6623f4177c

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
2016-07-18 15:08:13 +00:00
smain@google.com
39426fd8f6 update the version number used in docs
and update the offline docs landing page

Change-Id: I36388e0a125d6349518d9c4d5368fb76fb85cf7a
2016-07-13 16:08:25 -07:00
smain@google.com
68d98965c5 Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
am: 83f71845af

Change-Id: Id932ce48bb4274096b0c3f367ea0f9d0c7cabef5
2016-07-06 22:57:10 +00:00
smain@google.com
8562ab5ab8 remove "referenceonly" flag from the offline-docs build.
Add new offline-docs-referenceonly make rule.
And update online-sdk and offline-sdk to use the new site templates.

Change-Id: I1a9b8e3ff4973a147c6878092ae960a6980cb3d8
2016-06-30 19:08:11 -07:00
Allen Hair
fb9d75e7cd Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
2016-06-28 17:30:28 +00:00
Allen Hair
0e4f014c20 Add a flag to enable instrumentation of the framework classes.
Bug: 29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f
2016-06-27 17:20:24 -07:00
Gina Dimino
b7181150c4 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
am: d06520a488

Change-Id: Ice3bd7016d11e4f8f50c09e7b6ba3cb613911a52
2016-06-16 21:08:17 +00:00
Gina Dimino
d06520a488 Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev 2016-06-16 21:02:14 +00:00
Dirk Dougherty
8d129efa23 Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38
2016-06-15 00:28:03 +00:00
Dirk Dougherty
5f60f7cde6 Add API 24 to reference selector.
Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a
2016-06-14 16:27:32 -07:00
Gina Dimino
98ad88811c Docs: Suppress errors in SystemApi Build
Bug: 28427390

Change-Id: Ifea85bf7b1fcdd30a3d7f61bd17d0efba6368aa4
2016-06-01 16:13:53 -07:00
Dirk Dougherty
48d8747041 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104
am: 4569e9515c

* commit '4569e9515c651616f7e24f563b52de98fb4bf258':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I83d230df7e8fb620ec9ea57621492261fbb236b7
2016-05-02 19:39:03 +00:00
Dirk Dougherty
4569e9515c Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c
am: c25a9b0104

* commit 'c25a9b0104802454487ee6c428f9f070d389c02f':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: Ib8ff6165cbcb1d3fb52611e9f5e61ac69a0083b6
2016-05-02 19:34:34 +00:00
Dirk Dougherty
c25a9b0104 Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264
am: 6049306d8c

* commit '6049306d8c0f88f78dbc097bfcc971b095c6a9a3':
  Pass -yaml to ds builds to generate _book.yaml version of reference TOC.

Change-Id: I6b6a65147254b0d2ba5ec6aa52429819ddca9b77
2016-05-02 19:29:22 +00:00
Dirk Dougherty
dfa366dccf Pass -yaml to ds builds to generate _book.yaml version of reference TOC.
Change-Id: I1eced1670eb9d7892672b59f3b92833448b9949a
2016-04-29 18:06:11 -07:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
Dirk Dougherty
a2fcd056a9 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev
am: 58a252d

* commit '58a252d1f0048c8b4188f6ea87d072cb3a686a50':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: I0812cf024502b32259bd4431324e91d8fcf5e792
2016-04-27 21:20:57 +00:00
Dirk Dougherty
d9036ba7ef resolve merge conflicts of 0d00d28 to nyc-dev
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9
2016-04-27 10:44:43 -07:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Dirk Dougherty
0d00d287a5 Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs am: face65fe16
am: eeee5e2

* commit 'eeee5e2ec980f67b92597b7f5d8828593b3692aa':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: Id3d33d84e7127bc8cab0cdd4ccbc3505bfb2c824
2016-04-26 08:51:53 +00:00
Svet Ganov
70d720ca72 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b
2016-04-22 22:24:36 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Sujith Ramakrishnan
de3f4aead5 Merge "Unbundle RemoteService on TV - part 3" into nyc-dev
am: 7981e8f

* commit '7981e8ff6509769a590f15b440f989437d732be5':
  Unbundle RemoteService on TV - part 3

Change-Id: Ib5eb6363e904a1f66000d12263f66a8e5bd1f663
2016-04-22 21:02:04 +00:00
Sujith Ramakrishnan
b5b86c1100 Unbundle RemoteService on TV - part 3
- New service TVRemoteService triggered by SystemServer
- Provider service proxy and watcher for maintaining connections to unbundled
  services which have the BIND_TV_REMOTE_SERVICE permission.
- Shared library to facilitate connections between unbundled service and
  TVRemoteService.
- Unbundled service needs TV_VIRTUAL_REMOTE_CONTROLLER
  permission to be fully functional.

b/23792608

Change-Id: Ief5c6995883d1f7268a73bdd0c920c4c3f42cddb
2016-04-22 12:21:34 -07:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00
Robin Lee
e7c7d77f6f Merge "Move UidRange aidl declaration to system/netd" into nyc-dev
am: c618468

* commit 'c6184685d8f9b08abf73f83778ca129bb5c9c51d':
  Move UidRange aidl declaration to system/netd

Change-Id: I708ee20cfef47252a4b3ebecd1b2d46886326af4
2016-04-19 19:28:07 +00:00
Robin Lee
c6184685d8 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev 2016-04-19 19:19:43 +00:00
Robin Lee
106069412d Move UidRange aidl declaration to system/netd
Which owns the native UidRange.cpp, so it makes more sense for the
declaration to live there since frameworks/base depends on netd but not
vice versa.

Bug: 26694104
Change-Id: I0efda77713ee6f0ec8070fb0e09a694b95f6cd25
2016-04-18 15:26:47 +01:00
Martijn Coenen
d55def8924 Fix API review comments, add remove callback.
Bug: 28148561
Bug: 26426491
Change-Id: I5917ea5d8fe0d3195b407643ec271ab4eb8b30b7
2016-04-15 22:14:07 +02:00
Pavel Zhamaitsiak
5b2e5316d8 Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev
am: 0a97f22

* commit '0a97f22e068aeffd7384f64d26ab922b6d15670f':
  Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: I02d01abb811fc309024fb04fb5f56207a441a478
2016-04-14 01:01:29 +00:00