Michael Wright
70d8133cc3
am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
...
* commit '22458842cf0f86044856e6bc3c3a5fb2eda00862':
Added Razer USA, Ltd serval DO NOT MERGE
2014-12-03 20:41:47 +00:00
Adrian Roos
bf6f7960f4
am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev
...
* commit 'b67d8ef66540bfb72db44721f353c661d1f88144':
Refresh user list a little more eagerly
2014-12-03 20:41:45 +00:00
Svetoslav
dc026bafa9
am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev
...
* commit '5303451efc8553f83d921185c6aac30a178d632f':
Inconsistent media sizes for es-US locale.
2014-12-03 20:41:39 +00:00
Jason Monk
5a938481f3
am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev
...
* commit 'd6b001f154d7c1038edba4e7729b2aeb0124d359':
Don't show no sim icon on wifi devices
2014-12-03 20:41:33 +00:00
Daniel Sandler
23d7930cfd
am b0607472: am 195c4388: Fixing bugs in the LLand.
...
* commit 'b06074723fbed960749bab2b6e6b7e013f012e6a':
Fixing bugs in the LLand.
2014-12-03 20:41:27 +00:00
Jinsuk Kim
dfa931b400
am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action
...
* commit '5f23693b5cad0647a6bd95ba50dc87bb9023e864':
CEC: Check command type for power status monitor action
2014-12-03 20:41:21 +00:00
Craig Mautner
a34a7d21a9
am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev
...
* commit '418eecb6f870e4fc4dbb5715f61afd51827fe8a5':
Don't process windows belonging to unshown users
2014-12-03 20:41:15 +00:00
Lorenzo Colitti
45cd4df6a0
am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
Make StatusBar display all default networks.
2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085
am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 20:40:56 +00:00
Dongwon Kang
c0ab1086f0
am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
...
* commit '25a051880666022163b9a641737f26adc31e5477':
TIF: call tune() in HardwareSession
2014-12-03 20:40:45 +00:00
Michael Wright
da79c87f2e
Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev
2014-12-03 20:34:34 +00:00
Michael Wright
22458842cf
Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
2014-12-03 20:34:21 +00:00
Sanket Padawe
3a64032fe6
am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
...
* commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
Call entitlement on clicking tethering tile in quick settings.
2014-12-03 20:25:24 +00:00
Jason Sams
5f9e59b229
am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
...
* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
Fix bug in passing of context flags and version.
2014-12-03 20:25:19 +00:00
John Spurlock
06eaac4463
am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
...
* commit 'cdf7f984870344de1b1237e2a7749a3e32b2b688':
Doze: Fast path for pickup pulses.
2014-12-03 19:56:12 +00:00
Sreeram Ramachandran
95e4474c70
am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
Fix docs per API review.
2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d
am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 19:50:13 +00:00
Craig Mautner
56f10c2685
am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
...
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
Handle keyguard dismiss flags correctly
2014-12-03 19:49:46 +00:00
John Spurlock
cdf7f98487
Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
2014-12-03 19:49:26 +00:00
Geoff Mendal
fa89d0dc40
Import translations. DO NOT MERGE
...
Change-Id: Icfd76bed7ba5aa54f0549793ce00ad87702125c5
Auto-generated-cl: translation import
2014-12-03 11:47:54 -08:00
Geoff Mendal
c629d3e10e
Import translations. DO NOT MERGE
...
Change-Id: I642b3b429f66a22dcbbdfc016211b08c77b230f1
Auto-generated-cl: translation import
2014-12-03 11:39:03 -08:00
Sreeram Ramachandran
932c332147
Merge "Fix docs per API review." into lmp-mr1-dev
2014-12-03 19:15:38 +00:00
Eino-Ville Talvala
08a125562c
Revert "Camera: Add new capability flags as system features as well"
...
This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.
Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
2014-12-03 11:12:39 -08:00
Etan Cohen
7ab0ad1ffe
Add a global override for VoLTE calls (which leaves user setting in place)
...
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a
Fix docs per API review.
...
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
2014-12-03 10:53:35 -08:00
John Spurlock
f5d250deec
Doze: Fast path for pickup pulses.
...
Decrease the pulse duration when pulsing for pickup.
Add an option to skip the proximity check entirely, but don't
turn it on yet.
Bug: 18373928
Change-Id: I54f8dee004229193a18d488759bf797a16470cab
2014-12-03 13:48:28 -05:00
Derek Sollenberger
f29d5a5b21
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
...
bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
2014-12-03 13:43:30 -05:00
Craig Mautner
a9355bd1c5
Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
2014-12-03 18:41:30 +00:00
Trevor Johns
9aa9e46b4e
am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
...
* commit '5244ab68e4aae1dd95f87e690f7df83c0e630cef':
Docs: Add "admin" to samples categories
2014-12-03 18:36:30 +00:00
Trevor Johns
f560f334b0
am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs
...
* commit 'e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
Docs: Remove NavigationDrawer sample from What's New page
2014-12-03 18:36:25 +00:00
Trevor Johns
2047e6a0d1
am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs
...
* commit '4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
Docs: Remove GitHub links from docs/samples/new/index.html
2014-12-03 18:36:20 +00:00
Winson Chung
5051109699
am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 18:36:15 +00:00
Evan Charlton
10dff0a710
am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
...
* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
Re-add Connection.getCallCapabilities
2014-12-03 18:36:10 +00:00
Nancy Chen
a1163d575b
am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev
...
* commit '6963ff0e059977c901f4a961a24e7ffd3536af23':
Change a semi-colon to a colon in AudioState logging.
2014-12-03 18:36:02 +00:00
Paul Jensen
3107a9ad24
am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
...
* commit 'f805ba7dcc0e3cde052e2d5a84dedd478f206806':
Retry failed network validation every 10 minutes.
2014-12-03 18:35:57 +00:00
Adam Lesinski
72a6aeaca0
am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
...
* commit '91ca64ea291fceb43514b459ba76d13abc80f506':
AAPT: Add pathMotion custom classes to Proguard Keep set
2014-12-03 18:35:52 +00:00
Dianne Hackborn
bedd1744b2
am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 18:35:46 +00:00
Chris Wren
6054e61476
Track active notifications by key, not by reference.
...
Updates can change the reference without changing the key,
leaving the manager confused about which notification is active.
Fix applies to tracking active sound, vibrate, and lights.
Bug: 18369462
Change-Id: I0f606e6ef441737364795ba6feede1a7e5681191
2014-12-03 13:29:58 -05:00
Dianne Hackborn
1bc177c585
Fix issue #17948584 : Application crash and phone restart when app...
...
...is installed with <provider> with empty string.
Don't allow empty authorities, just like we don't allow null authorities.
Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
2014-12-03 10:20:30 -08:00
Trevor Johns
5244ab68e4
am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs
...
* commit 'b769fc0c576f485022330b40ae5180fb23cc53ee':
Docs: Add "admin" to samples categories
2014-12-03 18:12:47 +00:00
Trevor Johns
e218d0d3b5
am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs
...
* commit '25bc6be2843fcff1be9c074f1e92dac1ce76d809':
Docs: Remove NavigationDrawer sample from What's New page
2014-12-03 18:12:37 +00:00
Trevor Johns
4360c12bcb
am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs
...
* commit '740b22a522a224f88196ba33e06178e6a576f411':
Docs: Remove GitHub links from docs/samples/new/index.html
2014-12-03 18:12:31 +00:00
Winson Chung
de9848c641
Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
2014-12-03 18:10:38 +00:00
Evan Charlton
5ce118d1f4
Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
2014-12-03 18:09:31 +00:00
Nancy Chen
6963ff0e05
Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev
2014-12-03 18:05:58 +00:00
Sailesh Nepal
ef77f0ed78
Re-add Connection.getCallCapabilities
...
This method wasn't supposed to be removed.
Bug: 18594044
Bug: 18292176
Change-Id: Iac4cc0972643a8271957e480d3f48d50243af271
2014-12-03 18:05:48 +00:00
Paul Jensen
f805ba7dcc
Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
2014-12-03 18:04:30 +00:00
Adam Lesinski
91ca64ea29
Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
2014-12-03 18:04:24 +00:00
Dianne Hackborn
ef44c0514d
Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384
Work on issue #18572506 : AppOps in-memory state is invalid after...
...
...uninstalling updates to a system app
Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.
Also introduce more features to the appops command, which are useful
for testing this.
Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
2014-12-03 10:01:14 -08:00