Joe Fernandez
badfcbec48
am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
...
* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
docs: Update Android Dashboard for November 2014
2014-11-03 19:51:42 +00:00
Adam Lesinski
4bf58108d4
Fix issues that will be present in C++11
...
- char16_t is a distinct type, so stay consistent
with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
Since we mmap and cast data structures onto raw memory,
we need a precise definition (uint16_t), so we cast between
that (and static_assert that they are the same size).
Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
2014-11-03 11:49:47 -08:00
Andres Morales
56f299b87a
Add UserHandle to BeamShareData
...
Allows NfcService to start the beam transfer
process in the correct user.
Bug:17966846
Change-Id: Ie98c98e763f0c2eabf11afda645c421b0332a2f6
2014-11-03 11:44:10 -08:00
Joe Fernandez
4f8399c7ad
am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
...
* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014
2014-11-03 19:41:56 +00:00
Sreeram Ramachandran
60c0c0da0a
Send broadcasts when VPNs come and go.
...
This is achieved by adding TYPE_VPN as a supported legacy type.
Note that this is added in code, and not in a config.xml file,
so there's no way to remove TYPE_VPN (i.e., make it unsupported).
Bug: 17426546
Change-Id: I02eb5f22737720095f646f8db5c87fd66da129d6
2014-11-03 11:39:53 -08:00
Joe Fernandez
eff5efac21
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69
docs: Update Android Dashboard for November 2014
...
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
2014-11-03 11:33:28 -08:00
Stuart Scott
95fc99b334
Clean up public API of SubInfoRecord.
...
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
2014-11-03 11:11:56 -08:00
Nancy Chen
b2299c1303
Adn queries for multi-SIM. (2/3)
...
Define a method in Telecom to take in a subscription account and return
the URI for an ADN query for that account.
Bug: 17917937
Change-Id: Ic50a4add7fe44a5164271dc9c9e5a58e45e72336
2014-11-03 11:11:56 -08:00
Kenny Root
d130ba8b00
am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'affff329088e569158e0ee45ee0e580b3c285722':
Track change to Conscrypt
2014-11-03 18:58:09 +00:00
Kenny Root
affff32908
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
Track change to Conscrypt
2014-11-03 18:50:21 +00:00
Mike Lockwood
d89fab1385
am f9de1025: am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev automerge: 61cf7e0
...
* commit 'f9de10252f96a136784de9d79cfcc1ab9e30d13f':
Fix USB audio disconnect logic
2014-11-03 18:50:15 +00:00
John Reck
6398d2d42e
am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c8d135
...
* commit '8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f':
Fix counting
2014-11-03 18:50:10 +00:00
Adrian Roos
9b40ce39f7
am 70fd44fa: am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev automerge: 7736d37
...
* commit '70fd44fa022351b4451e61a7f0927362f4e33da8':
Improve TrustManagerService user lifecycle
2014-11-03 18:50:06 +00:00
Mike Lockwood
f9de10252f
am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
...
automerge: 61cf7e0
2014-11-03 18:45:52 +00:00
Mike Lockwood
61cf7e0fe7
am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
...
* commit '946863b63c05eb3ea38f422d5a198e95b0cc2aaa':
Fix USB audio disconnect logic
2014-11-03 18:44:12 +00:00
John Reck
8a8a40556e
am 541641d0: Merge "Fix counting" into lmp-mr1-dev
...
automerge: 5c8d135
2014-11-03 18:42:30 +00:00
John Reck
d0f91ebaef
am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480
...
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
Fix cancel crash
2014-11-03 18:41:39 +00:00
Adrian Roos
70fd44fa02
am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
...
automerge: 7736d37
2014-11-03 18:41:28 +00:00
Kenny Root
d00ced983e
am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
2014-11-03 18:40:55 +00:00
John Reck
5c8d135920
am 541641d0: Merge "Fix counting" into lmp-mr1-dev
...
* commit '541641d0334546d61bca13125ab2a36380dc662d':
Fix counting
2014-11-03 18:39:51 +00:00
Adrian Roos
7736d37568
am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
...
* commit '698078a7e9a59d5e4cf959a761ccb9a74377cfa4':
Improve TrustManagerService user lifecycle
2014-11-03 18:39:46 +00:00
Mike Lockwood
946863b63c
Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
2014-11-03 18:38:14 +00:00
John Reck
541641d033
Merge "Fix counting" into lmp-mr1-dev
2014-11-03 18:35:59 +00:00
Kenny Root
b0cb07348e
Merge "Track change to Conscrypt"
2014-11-03 18:34:00 +00:00
Adrian Roos
698078a7e9
Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
2014-11-03 18:33:54 +00:00
John Reck
88f5fc7c5a
Fix counting
...
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
2014-11-03 10:32:24 -08:00
John Reck
43973c9d73
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev
...
automerge: 9280480
2014-11-03 18:32:20 +00:00
John Reck
928048040c
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev
...
* commit '1787b4ea436f361e16c289755fa1a35c6e1c8845':
Fix cancel crash
2014-11-03 18:31:17 +00:00
John Reck
1787b4ea43
Merge "Fix cancel crash" into lmp-mr1-dev
2014-11-03 18:27:41 +00:00
Geoff Mendal
7526d81d43
am d90238eb: (-s ours) am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 2589d8e -s ours
...
* commit 'd90238eb150860f94bdae4515cb61515aed1490f':
Import translations. DO NOT MERGE
2014-11-03 18:15:56 +00:00
Geoff Mendal
d90238eb15
am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
automerge: 2589d8e
2014-11-03 18:08:15 +00:00
Geoff Mendal
2589d8e12d
am 188416bf: (-s ours) am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '188416bf38a2531158a8447f0f7b5719f22a39fd':
Import translations. DO NOT MERGE
2014-11-03 18:06:55 +00:00
Geoff Mendal
28e1db7ff4
am cd43c99c: (-s ours) am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 3765ae9 -s ours
...
* commit 'cd43c99cce3a0ee0df34be3eda795d1e70497446':
Import translations. DO NOT MERGE
2014-11-03 18:02:26 +00:00
Geoff Mendal
6d94373ed6
am ffada671: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 6bdbeba -s ours
...
* commit 'ffada671db0fefd98464185651ead1b78df00f21':
Import translations. DO NOT MERGE
2014-11-03 18:02:22 +00:00
Geoff Mendal
188416bf38
am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
Import translations. DO NOT MERGE
2014-11-03 18:01:46 +00:00
John Reck
55b46eff39
Fix cancel crash
...
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
2014-11-03 10:00:33 -08:00
Geoff Mendal
cd43c99cce
am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
automerge: 3765ae9
2014-11-03 17:57:24 +00:00
Geoff Mendal
3765ae9ff1
am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ef8c3cc4f663875f6b5c62364d4bc61080d3a23d':
Import translations. DO NOT MERGE
2014-11-03 17:54:25 +00:00
Ricardo Cervera
84b2ad68ee
am ad8415e4: am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs automerge: 73d5b5f
...
* commit 'ad8415e4ece645eef10888d8e27828d5ed9c85a9':
docs: Add links to Wear UI training from Design pages.
2014-11-03 17:54:24 +00:00
Geoff Mendal
ffada671db
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
automerge: 6bdbeba
2014-11-03 17:54:09 +00:00
Griff Hazen
5f2edfc12c
Improve support for the barcode-on-screen use case for wearables.
...
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.
Bug: 16299175
Bug: 17005635
Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
2014-11-03 09:53:54 -08:00
Geoff Mendal
76a730766c
Merge "Import translations. DO NOT MERGE"
2014-11-03 17:53:44 +00:00
Geoff Mendal
2d7e612ed1
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-11-03 17:53:12 +00:00
Geoff Mendal
6bdbebadad
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-03 17:52:57 +00:00
Geoff Mendal
ef8c3cc4f6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-03 17:52:11 +00:00
Ricardo Cervera
ad8415e4ec
am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
...
automerge: 73d5b5f
2014-11-03 17:47:52 +00:00
Ricardo Cervera
73d5b5f2e3
am d68bdd6b: am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
...
* commit 'd68bdd6bfa720a2837161bd66a456a07a640a774':
docs: Add links to Wear UI training from Design pages.
2014-11-03 17:46:17 +00:00
Scott Rowe
b8291ef75c
am c1c58b9a: am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs automerge: aa3be67
...
* commit 'c1c58b9a96c1c3e54244034be9c6745a4c7183c3':
docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:42:20 +00:00
Casey Burkhardt
1560b84579
am 1031eb71: am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev automerge: fb80a3b
...
* commit '1031eb71cc21025953df5018398ee70e96ee9ed6':
Disable circular display mask with color inversion
2014-11-03 17:42:15 +00:00
