Commit Graph

277484 Commits

Author SHA1 Message Date
Jordan Liu
761ffab151 Merge "Add key to CarrierConfig" am: 154c22d2d4 am: fda7370ddd
am: cf99a8e2e9

Change-Id: I2eb06df15a6605e8e688de470a0cd926e9989979
2016-09-27 22:34:16 +00:00
Jordan Liu
cf99a8e2e9 Merge "Add key to CarrierConfig" am: 154c22d2d4
am: fda7370ddd

Change-Id: I7b33003443e9f9bf173f6ec7e3942bed2c6714a5
2016-09-27 22:28:48 +00:00
Jordan Liu
fda7370ddd Merge "Add key to CarrierConfig"
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2
2016-09-27 22:24:23 +00:00
Jordan Liu
154c22d2d4 Merge "Add key to CarrierConfig" 2016-09-27 22:19:26 +00:00
Peter Qiu
601964b927 wifi: add test target/directory for unit testing WiFi framework APIs
The existing tests for the WiFi frameworks API android.net.wifi are
copied from frameworks/opt/wifi/tests, and will be removed in
frameworks/opt/wifi/tests.

Bug: 31745421
Change-Id: I789e983bc7dd02b6c3fa6a982ca671347912be0f
Test: frameworks/base/wifi/runtests.sh
2016-09-27 15:13:20 -07:00
Eric Schmidt
43055e69ae Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10 am: 6c7544b97a am: d5aa6361d9
am: 24b5c94154

Change-Id: I7c336b7230058aae727db0dd3a5045624a157421
2016-09-27 22:12:55 +00:00
Eric Schmidt
ac4ad5de44 docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532 am: defb8bdaea am: 561a946aa8
am: 71b54e6737

Change-Id: I30a47031fae06cbb9ce85dc497e4bcdd663edada
2016-09-27 22:12:02 +00:00
Eric Schmidt
587d9378d3 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b am: 168ea4e12c am: 03a34bc741
am: 8da1535ccd

Change-Id: I7f96d090c028ec3b53d0a58c0d2cd5b63a30225a
2016-09-27 22:11:11 +00:00
Eric Schmidt
8216d827b9 docs: Adding Espresso Intent and Web docs am: 34fb906c1a am: 0bb23eecef am: e8100dbfd9
am: 6be5b8abf3

Change-Id: I3f08bf139c52573ad1aea5b767d4b12b1cec38f7
2016-09-27 22:10:17 +00:00
Eric Schmidt
24b5c94154 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10 am: 6c7544b97a
am: d5aa6361d9

Change-Id: I80cb5816569d183e5e0cbe35f79bb07484844bf6
2016-09-27 22:05:04 +00:00
Eric Schmidt
71b54e6737 docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532 am: defb8bdaea
am: 561a946aa8

Change-Id: Ic4c16d4ee51b666cea951f2a6c04256b2d120d2e
2016-09-27 22:04:18 +00:00
Eric Schmidt
8da1535ccd Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b am: 168ea4e12c
am: 03a34bc741

Change-Id: I2da4b560acf427a42e2f5fbc2ad439e15294210c
2016-09-27 22:03:27 +00:00
Eric Schmidt
6be5b8abf3 docs: Adding Espresso Intent and Web docs am: 34fb906c1a am: 0bb23eecef
am: e8100dbfd9

Change-Id: Ic4e3179a616b45ef3e2b97e525bc14de688e7d61
2016-09-27 22:02:40 +00:00
Greg Kaiser
1983f9b05b ContextHubService: Hack around 32-bit app ID
The NanoApp.java class has a bug (b/30808791) where the API treats
app IDs as 32-bits, instead of 64-bits.  We are too late in the
Android N release cycle to change this API.

We previously put in a hack to fix this only for Google nanoapps.
However, our GTS nanoapps need this to work, and there are other
partners who need this to work in the N timeframe.  So we make
a more robust hack which parses the full 64-bit app ID out of
the header binary.

Test: Compiles and runs GTS
Bug: 31767599
Change-Id: Ic43f1f62c685fb99aac08d08767d1a67c329503f
2016-09-27 15:01:48 -07:00
Christopher Tate
4b17e984b6 Don't leak wakelock instances
Bug 31247436

Change-Id: I7c2ad956c43233b37e53856e9321cb87b01c35da
2016-09-27 15:00:48 -07:00
Eric Schmidt
d5aa6361d9 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10
am: 6c7544b97a

Change-Id: Ib96fa46b29b30274956180734f4499458a05a906
2016-09-27 21:59:45 +00:00
Eric Schmidt
811054a843 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev am: d780260f10
am: 53fd017571

Change-Id: I0528231dcbad298db335bbb9e1df605925cd73d2
2016-09-27 21:59:43 +00:00
Eric Schmidt
561a946aa8 docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532
am: defb8bdaea

Change-Id: I50dd95ac7263b4af2b5f9482b8b2de18ceda5a5e
2016-09-27 21:58:52 +00:00
Eric Schmidt
6922bdd766 docs: Update BroadcastReceiver docs for performance am: 8cf3c1b532
am: 113cdca9fd

Change-Id: If3f44d7dd7cf7417fb952fe1571d35f468e360e9
2016-09-27 21:58:51 +00:00
Eric Schmidt
c614f8cf64 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b
am: 20e5ac3951

Change-Id: I070007f4eea7e76c1ec2ef1edda5447ed7292d2b
2016-09-27 21:58:03 +00:00
Eric Schmidt
03a34bc741 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev am: f4dbb4091b
am: 168ea4e12c

Change-Id: I758356a9a6ddf09863dd02273e571cdff8c05c98
2016-09-27 21:57:58 +00:00
Eric Schmidt
f22cf67947 docs: Adding Espresso Intent and Web docs am: 34fb906c1a
am: d1b0367221

Change-Id: I87fd05fc337ac43f5bae4a2fd74ba9a4c41cf24a
2016-09-27 21:57:13 +00:00
Eric Schmidt
e8100dbfd9 docs: Adding Espresso Intent and Web docs am: 34fb906c1a
am: 0bb23eecef

Change-Id: I86911914d287541496228d639fb7040e3ec63e80
2016-09-27 21:57:10 +00:00
Eric Schmidt
53fd017571 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev
am: d780260f10

Change-Id: I92a2059fb0c580bdb762e8b16d7230441ca859f7
2016-09-27 21:52:03 +00:00
Eric Schmidt
113cdca9fd docs: Update BroadcastReceiver docs for performance
am: 8cf3c1b532

Change-Id: I7c6647a7cf1be2f9af42c8f087916f7692dab2d5
2016-09-27 21:51:57 +00:00
Eric Schmidt
6c7544b97a Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev
am: d780260f10

Change-Id: Ia7358c8ca2f7afcff130e275d79ae45f3e37e411
2016-09-27 21:51:37 +00:00
Eric Schmidt
defb8bdaea docs: Update BroadcastReceiver docs for performance
am: 8cf3c1b532

Change-Id: I7781c542c7512bb178ba23c7421b47d7d1be8b09
2016-09-27 21:51:34 +00:00
Eric Schmidt
20e5ac3951 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev
am: f4dbb4091b

Change-Id: Ic8fad4eb41031461a7446eec573e7cc034e0e4f1
2016-09-27 21:50:24 +00:00
Eric Schmidt
d1b0367221 docs: Adding Espresso Intent and Web docs
am: 34fb906c1a

Change-Id: Ie925f354e1ceea1df4fee210759538ef1df58036
2016-09-27 21:50:19 +00:00
Eric Schmidt
168ea4e12c Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev
am: f4dbb4091b

Change-Id: Ib807c964b623ff8e968b723990d7e6eb2e969569
2016-09-27 21:50:15 +00:00
Eric Schmidt
0bb23eecef docs: Adding Espresso Intent and Web docs
am: 34fb906c1a

Change-Id: Ie6a2d5e868f76b9959a6fbe3e0a151c44d132b02
2016-09-27 21:50:12 +00:00
Eric Schmidt
d780260f10 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev 2016-09-27 21:42:06 +00:00
Eric Schmidt
f4dbb4091b Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev 2016-09-27 21:41:43 +00:00
Peng Xu
d37a13bb5e TYPE_DYNAMIC_SENSOR_META should be wake up sensor
This CL makes the default TYPE_DYNAMIC_SENSOR_META sensor a wake-up
type.

Test: m cts-verifier
Test: Run "Dynamic Sensor Discovery Test" with a sensor HAL that
      support dynamic sensor discovery (e.g. contexthub + ag/1189124)

Bug: 31068976

Change-Id: I2e6320b1e1e34a8c22677be3e6e318c149e1bb26
2016-09-27 14:09:33 -07:00
Svet Ganov
8d15192e06 Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev am: 5c07d0c2ee
am: 3ee7bf7502

Change-Id: I9fed00a764b00d203225e23c5fbd11fd409e5011
2016-09-27 20:59:50 +00:00
Dan Albert
7ce8df32a7 Move libjnigraphics to ndk_library.
The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.

Test: make native
Bug: http://b/30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0
2016-09-27 13:59:05 -07:00
Dan Albert
2a8d9c20bd Migrate libandroid.so to ndk_library.
Test: make native
Bug: http://b/30465923
Change-Id: I956b5014c4da4dce1ce28da706b9d868eba4cce3
2016-09-27 13:59:04 -07: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
Andrew Solovay
653c7a528d Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am: 156d5fd88e am: af089036be am: f52c849083
am: 36c387ab74

Change-Id: I7cedbf9b412be162f451be4dc3cbdedab5e7aef7
2016-09-27 20:58:08 +00:00
Andrew Solovay
13b474a011 docs: Redirect for /preview/setup-sdk.html am: 572d710ba3 am: a56c8c79d8 am: 61212ec382
am: f26df79b7c

Change-Id: Ib8df7e511e0171331a1b7042cf21d1d55b226bc6
2016-09-27 20:57:09 +00:00
Svet Ganov
3ee7bf7502 Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev
am: 5c07d0c2ee

Change-Id: I30a614cedc0ccd24117f061776f5b0332670ca46
2016-09-27 20:51:31 +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
Andrew Solovay
36c387ab74 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am: 156d5fd88e am: af089036be
am: f52c849083

Change-Id: I3eb721e9e5e6bec1faaa0c09977e638e2bba60e1
2016-09-27 20:50:37 +00:00
Andrew Solovay
f26df79b7c docs: Redirect for /preview/setup-sdk.html am: 572d710ba3 am: a56c8c79d8
am: 61212ec382

Change-Id: I7f90924db750cb346a26b9f3b68ee5079d191c99
2016-09-27 20:49:48 +00:00
Andrew Solovay
67f3f0fb54 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am: 156d5fd88e
am: 3e8cf83163

Change-Id: Id75022f9e9b94255d62c44a62a1a7fbba725928d
2016-09-27 20:47:24 +00:00
Andrew Solovay
1c20486ad7 docs: Redirect for /preview/setup-sdk.html am: 572d710ba3
am: 87460c5325

Change-Id: I671dafa35c107fc76623ab333de8d6cd2e5a424f
2016-09-27 20:46:35 +00:00
TreeHugger Robot
5c07d0c2ee Merge "[DO NOT MERGE] Use tokens instead of account access trackers" into nyc-mr1-dev 2016-09-27 20:45:48 +00:00
Andrew Solovay
f52c849083 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am: 156d5fd88e
am: af089036be

Change-Id: Ie457b30f25fed45232f044206e5fe356ad6e6cfc
2016-09-27 20:45:00 +00:00
Andrew Solovay
61212ec382 docs: Redirect for /preview/setup-sdk.html am: 572d710ba3
am: a56c8c79d8

Change-Id: Id966ed24a5aa6cf3a7dc7f30a6c49a559cbb39ca
2016-09-27 20:44:06 +00:00
Andrew Solovay
3e8cf83163 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev
am: 156d5fd88e

Change-Id: Ied7f37838c2ecb2b71348c99de36bf8764063731
2016-09-27 20:41:16 +00:00