Dirk Dougherty
3776a3253f
Add build target for generating navtree json with all inherited members. am: 7d47b55cc0
...
am: e444205930
2016-09-17 00:14:04 +00:00
Dirk Dougherty
e444205930
Add build target for generating navtree json with all inherited members.
...
am: 7d47b55cc0
2016-09-16 23:56:51 +00:00
Dirk Dougherty
7d47b55cc0
Add build target for generating navtree json with all inherited members.
...
Change-Id: I142e848b5288d92e14445025705ea7596e635b6b
2016-09-13 16:44:25 -07:00
Svet Ganov
7580351e9e
[DO NOT MERGE] While-list apps to access account if already saw it am: 91d37f43c7
...
am: f56f70365d
2016-09-09 02:42:23 +00:00
Svet Ganov
91d37f43c7
[DO NOT MERGE] While-list apps to access account if already saw it
...
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). However, if the
sync adapter package already got the account from another
app which means it already saw the account we white-list
the sync adapter app to access the account as it already
saw it - the bird is out of the cage.
bug:31162498
Change-Id: I2b72f3b0d6307561ed68db2f2e9c900b15e8d098
2016-09-08 16:46:46 -07:00
smain@google.com
689dc4a1fe
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
...
am: 7dd9749246
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
2016-09-06 18:08:10 +00:00
smain@google.com
f6b5cde9d9
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build. am: 7dd9749246 am: ff8cb50979 am: 3578867216
...
am: 1696dcd4b4
2016-09-03 01:36:24 +00:00
smain@google.com
ff8cb50979
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
...
am: 7dd9749246
2016-09-03 01:19:05 +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
893867044b
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 am: 63f29277bc am: 7ed5e42567
...
am: 3552190ba3
2016-09-02 22:05:24 +00:00
smain@google.com
63f29277bc
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
2016-09-02 21:36:07 +00: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
cdd5f65515
Merge "Fix missing dependency on R.java" am: 227a176508 am: bfd4422060
...
am: 0903ecb99b
2016-09-01 05:52:47 +00:00
Colin Cross
0903ecb99b
Merge "Fix missing dependency on R.java" am: 227a176508
...
am: bfd4422060
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
8348bd2317
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
...
am: 9f341e4e49
2016-08-31 18:28:45 +00:00
Jakub Pawlowski
9f341e4e49
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
...
am: 40a16ea242
2016-08-31 18:21:00 +00:00
smain@google.com
151833ab14
resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ied5ddc04e6da65cba62698cd18ba78496f5fb646
2016-08-31 08:42:09 -07: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
c9ec419c9c
replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)
...
am: dde8deb950
2016-08-31 03:40:37 +00: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
Mitchell Wills
722de5f9d0
DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
...
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07: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 0d0f0c7faf4e1af1b807
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 e4c50de752581a4f7b31
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
2016-08-17 23:25:38 +00:00
Dirk Dougherty
c05521b401
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77
...
am: 7e7ea76356
2016-08-17 23:16:03 +00:00
Dirk Dougherty
d66ec65b77
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
...
am: b042ab1eb6
2016-08-17 22:59:23 +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
Todd Kennedy
8c073e0aad
Move EphemeralResolverService am: 31b95e0265
...
am: fa67fad84e
2016-08-05 17:52:00 +00:00
Todd Kennedy
31b95e0265
Move EphemeralResolverService
...
It should not have been under com.android.internal
Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
2016-08-05 07:17:52 -07:00
Scott Main
5eac2b0d88
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c
...
am: 38b71c5741
2016-07-18 15:15:14 +00: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
2016-07-18 15:08:13 +00:00
smain@google.com
e8c3590a77
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
...
am: 6623f4177c
2016-07-18 15:07:55 +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
Jorim Jaggi
6e57aae680
Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev
...
am: 165b011a74
2016-07-08 22:08:37 +00:00
Jorim Jaggi
e8fde5d966
Improve initial unlock delay (1/2)
...
When checking for the credentials, we add a new callback
onEarlyVerified which gets called as soon as we know that the
credential was correct.
In KeyguardUpdateMonitor, we track the unlocked state of the user,
and if it's still locked, we slow down all the transitions to allow
for a more gradual unlock experience.
Bug: 29007436
Change-Id: I406d228f9f3e41e07fe3292a61df175a7f579e4d
2016-07-08 11:50:54 -07:00
smain@google.com
c1108c3927
Merge \"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\" into nyc-mr1-dev
...
am: 925a5ffa5e
2016-07-07 01:31:58 +00:00
smain@google.com
c526ad0e89
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
2016-07-07 01:25:11 +00:00
Annie Chin
d99252358b
Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
...
am: d58f07f58a
2016-07-06 23:29:50 +00:00
Annie Chin
d58f07f58a
Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev
2016-07-06 23:22:10 +00: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
2016-07-06 22:57:10 +00:00
Erik Kline
e62b36bb33
Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev
...
am: 58ef88927d
2016-07-06 13:15:47 +00:00
Erik Kline
4e37b70440
[net mgmt svc] add method to retrieve INetd reference
...
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
2016-07-06 19:32:01 +09:00
Annie Chin
ecb9f3e9b8
Add callbacks to VoiceInteractionManagerService
...
Bug: 29582254
Change-Id: I548d01bd1c7e261b2d2e0afd606d964e5553124e
2016-07-01 13:00:09 -07: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
b216e80956
Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073
...
am: fb20170c0f
2016-06-28 17:33:34 +00:00
Allen Hair
fb9d75e7cd
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
...
am: 15783f0073
2016-06-28 17:30:28 +00:00
