1355 Commits

Author SHA1 Message Date
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569153917a650f1d48efa20ba8846a9f3)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Joseph Pirozzo
d94c280a7f MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
2016-11-02 01:03:51 +00:00
Joseph Pirozzo
631768d814 MAP MCE
Add MAP client code into packages/apps/Bluetooth.  Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).

Bug: 30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)
2016-11-01 17:39:16 -07:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)"
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
2016-10-28 02:50:54 +00:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
2016-10-27 23:09:35 +00:00
Svet Ganov
9d56963630 [DO NOT MERGE] Use tokens instead of account access trackers am: 32bfb594af
am: 18b725ac0a

Change-Id: I8f90fb4c4d4baa29727d84a28db68f277d305a74
2016-09-27 20:59:00 +00:00
Svet Ganov
18b725ac0a [DO NOT MERGE] Use tokens instead of account access trackers
am: 32bfb594af

Change-Id: I1706ecca7b3b98a2a38483545270941ce8899939
2016-09-27 20:51:28 +00:00
smain@google.com
a056abf598 add source.properties file to the offline docs build which is required to get this in the SDK Manager am: 2f2365de4a
am: d32abed1af

Change-Id: I9d6f6f9ce302b3c87d7aac19e6e97cd8a0024f98
2016-09-27 17:28:54 +00:00
smain@google.com
6b860feb42 add source.properties file to the offline docs build which is required to get this in the SDK Manager am: 2f2365de4a
am: 6ed77be41d

Change-Id: I24b8c286fa94c6c27eb9e9fe67b0d38cd17f5544
2016-09-27 17:28:53 +00:00
smain@google.com
d32abed1af add source.properties file to the offline docs build which is required to get this in the SDK Manager
am: 2f2365de4a

Change-Id: I7a5261a043d803fdc0ac6b916708e0f743b31865
2016-09-27 17:23:54 +00:00
smain@google.com
6ed77be41d add source.properties file to the offline docs build which is required to get this in the SDK Manager
am: 2f2365de4a

Change-Id: I15b5ea8a37ec7c718d23db14baed6c8ffb0af13c
2016-09-27 17:23:54 +00:00
Narayan Kamath
c4108d2f24 Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250
am: 5e7dd0999e

Change-Id: I45e2c290cbed1fcf917d54f6a50a60bfa7540f44
2016-09-26 10:11:57 +00:00
Narayan Kamath
5e7dd0999e Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3
am: c1d97c9250

Change-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949
2016-09-26 10:07:19 +00:00
Svet Ganov
32bfb594af [DO NOT MERGE] Use tokens instead of account access trackers
We keep track which process saw and account to whitelist
the app for future access as an optimization to avoid
prompting the user for account access approval. Some apps
use SefeParcelable where the parcels are marshalled
which does not allow the parcel to contain IBinders.
To avoid this we are switching from account tracker remote
objects to unforgeable tokens.

bug:31162498

Change-Id: I3b52bff720655f695ad0c58d420eb35ef93161b9
2016-09-24 06:00:14 +00:00
Hugo Benichi
0daeac5dd4 New IpConnectivityMetrics service am: eab511b582
am: 3a353a2044

Change-Id: I5cf485edd3ab1ebb81a2a9d35dfb8bd6d8bcc305
2016-09-23 03:54:06 +00:00
Narayan Kamath
2090e9222c Remove (now) unnecessary reference to core-lambda-stubs.
Tis now included in core-oj.

bug: 31675876
Test: make checkbuild
Change-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e
2016-09-22 17:52:37 +01:00
Hugo Benichi
eab511b582 New IpConnectivityMetrics service
This patch defines a new metrics service for IpConnectivity events
defined in android.net.metrics, separate from currently existing
MetricsLoggerService.

Similarly to MetricsLoggerService, the new service has an event buffer.
It also implements a dumpsys interface that can be used to flush events
and output a serialized proto.

Bug: 31254800
Change-Id: I0c3faeb4008b283f85d9ba9460371fa68956ea3b
2016-09-22 22:25:27 +09:00
smain@google.com
2f2365de4a add source.properties file to the offline docs build
which is required to get this in the SDK Manager

Change-Id: If53cdedcb8f5910fe37add44168348c9fd14d0cb
2016-09-21 16:26:41 -07:00
Etan Cohen
b7f1a665b5 Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46
am: ad864c8fd9

Change-Id: I338cd7ddf54997bdf19a95056e5793103ffc2e23
2016-09-20 17:07:31 +00:00
Etan Cohen
ad864c8fd9 Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535
am: eb4c838c46

Change-Id: Ie03f1e3fbead74c4de77758163ad911e68e54b90
2016-09-20 16:58:32 +00:00
Etan Cohen
3855370c24 [NAN] Rename to make discovery explicit
Pure rename operation - no other functional changes.

(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)

Bug: 31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
2016-09-19 21:52:14 +00:00
Dirk Dougherty
b63d9d8aad Add build target for generating navtree json with all inherited members. am: 7d47b55cc0
am: 33684f217b

Change-Id: I34040be694eb1c82b2feb977c6389890d7755d0d
2016-09-17 00:24:10 +00:00
Dirk Dougherty
3776a3253f Add build target for generating navtree json with all inherited members. am: 7d47b55cc0
am: e444205930

Change-Id: I9aafdf69cf9e0f29d6367a0dacfef53f5147a2cf
2016-09-17 00:14:04 +00:00
Dirk Dougherty
33684f217b Add build target for generating navtree json with all inherited members.
am: 7d47b55cc0

Change-Id: Ib9279dc1ec2149a535f4b7a4843612da6af27650
2016-09-16 23:58:02 +00:00
Dirk Dougherty
e444205930 Add build target for generating navtree json with all inherited members.
am: 7d47b55cc0

Change-Id: I66a805e871a9501bd5d19587dbc004be0cfd01d0
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

Change-Id: I3a553a7efe34feb9fbfa5d5c504874a2780bf132
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

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
f6b5cde9d9 remove 'useUpdatedTemplates' flag that's no longer supported. Fix build. am: 7dd9749246 am: ff8cb50979 am: 3578867216
am: 1696dcd4b4

Change-Id: Ib752a8fc535b7856b0881c79d306c33026f3f5ee
2016-09-03 01:36:24 +00:00
smain@google.com
ff8cb50979 remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
am: 7dd9749246

Change-Id: I5a048d040dd040f40d0b5e30ea67e62de4cf7259
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

Change-Id: I40e7ef517807b0ba5cb9d60045a0125380b218e6
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

Change-Id: I9833fe119f6e5fef4cd74439c71d6a40fb5d5db9
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

Change-Id: I2b50adaa9ed052cf3022a78a77729c3b618834f8
2016-09-01 05:52:47 +00: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
8348bd2317 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
am: 9f341e4e49

Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132
2016-08-31 18:28:45 +00: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
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

Change-Id: Ide293756b6b7a75a434ff9ed3cf15cd40fbd3452
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 0d0f0c7faf530a0fa5595dd539c3f56afeb6603a,
 Change-Id: Ib12711f56a64052455843859125d72268c465fc0)

Bug: 27122760
Change-Id: Ie1905a5d907e5b09d449af52814b1aacb6426477
(cherry picked from commit 4e1af1b80735f5d61f089432a63a23937c994546)
2016-08-26 13:18:55 -07:00