Prerepa Viswanadham
ff5e5db319
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.
Bug 18395071
Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
2014-12-04 18:30:03 +00:00
Adam Lesinski
720beef28d
Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev
2014-12-04 18:24:41 +00:00
Christoph Studer
3bf7b80e48
am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev
...
* commit '391232da084d715b9f20539a98b4a49cc56bf949':
Log the state of the notification shade
2014-12-04 18:15:03 +00:00
Christoph Studer
2d58c9220c
am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
...
* commit '798c05523bc238853269a24dc526a31f0464a589':
NoMan: Update effect suppressor on listener remove
2014-12-04 18:14:59 +00:00
Christoph Studer
391232da08
Merge "Log the state of the notification shade" into lmp-mr1-dev
2014-12-04 18:09:12 +00:00
Christoph Studer
798c05523b
Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
2014-12-04 18:08:38 +00:00
Chris Wren
f55ad28444
am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
...
* commit 'ffc050ad369c09d740d33f72e66d03f6e2473c49':
Track active notifications by key, not by reference.
2014-12-04 18:07:41 +00:00
Chris Wren
ffc050ad36
Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
2014-12-04 18:02:54 +00:00
RoboErik
8f0953963d
am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
...
* commit '7fbcac6a03db6d09ab3816738754a64f62de22b9':
Tweak the behavior of the MediaSessionStack
2014-12-04 17:53:42 +00:00
Lajos Molnar
610e288de6
media: allow full range of Vorbis sampling rates
...
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
2014-12-04 09:50:54 -08:00
RoboErik
7fbcac6a03
Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
2014-12-04 17:46:41 +00:00
Justin Harrison
fdb33a0826
am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
...
* commit '21af21ca07cd07d7164bf7b7d70513c193785247':
Revert "Improve fling physics for recents"
2014-12-04 17:44:42 +00:00
Justin Harrison
21af21ca07
Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
2014-12-04 17:37:55 +00:00
Justin Harrison
3f7dac5a1c
Revert "Improve fling physics for recents"
...
This reverts commit 00d947bda0 .
Change-Id: I3d6696227a381d232baed8fdbcbe34d3c4976ebe
2014-12-04 17:37:24 +00:00
Benjamin Franz
e8b98925d0
Change the routing path of bluetooth headset connections.
...
The HeadsetService is now bound directly by the BluetoothManagerService.
The IBinder object related to the HeadsetService is then given back to
the BluetoothHeadset and to the client app. This change makes the
HeadsetService available for managed profile clients.
Bug: 16968338
Change-Id: I016d1837e4f987c0fab1fc2c64cb06eb91b24d87
2014-12-04 16:57:25 +00:00
Paul Jensen
b10e37fd1c
Reap unvalidated networks that have no chance of becoming highest scoring.
...
These networks are unneeded and waste battery. We won't bring up these
networks in the first place if they have no chance of becoming highest scoring.
This change handles the case where these networks are already up and
transition to a state where they have no chance of becoming highest scoring.
This happens when another network validates with a score higher than this
network can ever hope to attain.
bug:18489123
Change-Id: I77a96a72e250e25e44e0c50e7a928af8b35bb6ab
2014-12-04 11:22:39 -05:00
Jorim Jaggi
9f44ea8fbc
am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev
...
* commit '54daab1009e7be849fa1dcbf4ee3f9d0ba40d732':
Improve fling physics for recents
2014-12-04 15:27:05 +00:00
Jorim Jaggi
d3cf181d57
am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev
...
* commit '47faf69cfdca06cb82176a4b617814fd3e1aac18':
Fix rounded corners in bottom QS panel.
2014-12-04 15:26:59 +00:00
smain@google.com
cc10c02b10
am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
...
* commit '6c59abc947491d8c291413eb29e1669f61059c7a':
update L Preview message and disallow crawling /preview
2014-12-04 15:20:34 +00:00
Jorim Jaggi
54daab1009
Merge "Improve fling physics for recents" into lmp-mr1-dev
2014-12-04 15:18:18 +00:00
Jorim Jaggi
47faf69cfd
Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev
2014-12-04 15:17:03 +00:00
Derek Sollenberger
c1a2f38ce0
am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 15:17:01 +00:00
Christoph Studer
a6ecb61ee7
am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
...
* commit 'c9660bdf289ba7ee20854af9de4133df5fb42d92':
RankingHelper: Remove STOPSHIP
2014-12-04 15:16:55 +00:00
Deepanshu Gupta
43d0e67573
am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev
...
* commit '7e168ad04a4553c23bca1e9bd427ba6088493908':
Ensure that RandomAccessFile is not leaked.
2014-12-04 15:16:49 +00:00
Deepanshu Gupta
52a60ff636
am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
...
* commit '302a7cc13a02863ef2e9d9102df761e92150de65':
Fix AnalogClock rendering
2014-12-04 15:16:44 +00:00
Deepanshu Gupta
c16d1448bb
am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev
...
* commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234':
Fix typos in previous bugfixes.
2014-12-04 15:16:37 +00:00
Jinsuk Kim
92a4627250
am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
...
* commit 'f16473951052b1f9eb06753c43b93255452c8838':
CEC: Generate hotplug events upon adding listener
2014-12-04 15:16:32 +00:00
Vinit Deshpande
aefb79b2dd
am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
...
* commit '31bd4220855ded4ece67c8ae75227441a12a00a7':
Remove notification for SoftAP turned on
2014-12-04 15:16:26 +00:00
Geoff Mendal
c7d8a48bb0
am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'cc7c68b54801e07107d6e212ae50a375d730e000':
Import translations. DO NOT MERGE
2014-12-04 15:16:21 +00:00
Geoff Mendal
c7b5257521
am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a821e77d7ede196f6f39cd2ed2bc974bc68e162d':
Import translations. DO NOT MERGE
2014-12-04 15:16:15 +00:00
Geoff Mendal
5d1f688034
am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '72a204199510afdeb9cec483b4113433fe61089e':
Import translations. DO NOT MERGE
2014-12-04 15:16:10 +00:00
Erik Kline
95b5ca9019
am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 15:16:04 +00:00
John Spurlock
959312701f
am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev
...
* commit '32b61ab28f54e5b00f472b2166f9b1100375e4ff':
Doze: Don't block pickup pulses on a proximity check.
2014-12-04 15:15:59 +00:00
Pavel Zhamaitsiak
3891681969
am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev
...
* commit '1fb699360d1b193c5144c7dcf209d8dc8dfbb8b8':
IMS Call End Cause Additions
2014-12-04 15:15:53 +00:00
duho.ro
36ccf75bb2
am fb754252: UICC : discard language setting of SIM
...
* commit 'fb7542522493101778862340c548db731f3a8681':
UICC : discard language setting of SIM
2014-12-04 15:15:40 +00:00
Cheuksan Wang
dba26aa2e7
am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '109ec376da86de1275f73fa432d6344431a457e9':
new SMS/MMS carrier app API
2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
...
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
2014-12-04 15:15:27 +00:00
Winson Chung
4eb896ef01
am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
...
* commit 'ba1307b2b42b60893c88622f41f99efa2356350d':
Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
2014-12-04 15:15:21 +00:00
Jim Miller
f2b934b42b
am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
...
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45':
Stop keyguard from spamming the log
2014-12-04 15:15:16 +00:00
xinhe
9a4472bf45
am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
...
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
Unable to unlock SIM with a PIN/PUK
2014-12-04 15:14:59 +00:00
Wink Saville
0304c529b6
am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
...
* commit '82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
2014-12-04 15:14:49 +00:00
Christopher Tate
e808d2df76
am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
Adjust wallpaper-restore acceptance criteria
2014-12-04 15:14:43 +00:00
smain@google.com
6c59abc947
am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
...
* commit '9db37264719d022391b67ad39cc274cd9d05bc40':
update L Preview message and disallow crawling /preview
2014-12-04 15:12:48 +00:00
David Friedman
47eddc7cc9
am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
...
* commit 'bf6a4bfb20f3b8db3cf4c47fa887d7cc603ce5c4':
Change notes for NDK r10d, to publish to DAC
2014-12-04 13:35:40 +00:00
Derek Sollenberger
4d9da135ca
Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
2014-12-04 13:04:52 +00:00
Christoph Studer
c9660bdf28
Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
2014-12-04 12:12:25 +00:00
Benjamin Franz
4b9f8ede4e
Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
...
This intent is needed by Smart Lock agents to check whether a given user is
active on the device.
Bug: 18530771
Change-Id: I5d460cb0cfa8ec4f7952702a3d25d089db78a50f
2014-12-04 11:20:13 +00:00
Deepanshu Gupta
7e168ad04a
am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev
...
* commit '6cbef4bd3e1f16647ab01dc29df9a357d54a85de':
Ensure that RandomAccessFile is not leaked.
2014-12-04 07:00:19 +00:00
Deepanshu Gupta
302a7cc13a
am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
...
* commit '4628d51a0d01641ca7fe2cf8403ad551ea6f50ce':
Fix AnalogClock rendering
2014-12-04 07:00:14 +00:00
Deepanshu Gupta
b2ded18a84
Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev
2014-12-04 06:58:25 +00:00