Svetoslav
130521b91f
am 323c02d4: am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
...
* commit '323c02d4e0860c925aa0c4db14be8acaf231c69b':
Notify accessibility for window changes after an app animation end.
2014-12-05 21:20:22 +00:00
Paul Jensen
5baa08fbf6
am 704c8c0c: am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
...
* commit '704c8c0c3b2753c8d91aef23d39a9f6255389fd3':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-05 21:19:57 +00:00
Svetoslav
323c02d4e0
am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
...
* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
Notify accessibility for window changes after an app animation end.
2014-12-05 20:19:24 +00:00
Paul Jensen
704c8c0c3b
am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
...
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-05 20:18:45 +00:00
Christoph Studer
bb0e8060c6
am ad25e361: am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
...
* commit 'ad25e3610ef353be2004c8427c3f38aceda9171e':
NoMan: Update effect suppressor on listener remove
2014-12-05 16:26:17 +00:00
Chris Wren
6c30b4cc58
am 2f147f6e: am f55ad284: am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
...
* commit '2f147f6e7a01e098557cf83b668d6e511452a9ed':
Track active notifications by key, not by reference.
2014-12-05 16:26:12 +00:00
RoboErik
f77f0b495f
am 91bba400: am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
...
* commit '91bba400731c866e2aa9a9237e071d754cea8d20':
Tweak the behavior of the MediaSessionStack
2014-12-05 16:26:07 +00:00
Christoph Studer
ad25e3610e
am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
...
* commit '2d58c9220cdeaac63ae1a5c9f1c80c3e131ae296':
NoMan: Update effect suppressor on listener remove
2014-12-05 15:51:54 +00:00
Chris Wren
2f147f6e7a
am f55ad284: am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
...
* commit 'f55ad284448d226b047815715bb10e193c88ae0d':
Track active notifications by key, not by reference.
2014-12-05 15:51:48 +00:00
RoboErik
91bba40073
am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
...
* commit '8f0953963d91a22021676cc29b0f572c1a913124':
Tweak the behavior of the MediaSessionStack
2014-12-05 15:51:39 +00:00
Amith Yamasani
2f80972d02
am 2faf91fb: am 66cbec51: am d234dc1f: Merge "Correct check of is user running"
...
* commit '2faf91fbb300882afd1092b788aa16295eb3dde8':
Correct check of is user running
2014-12-05 00:15:57 +00:00
Amith Yamasani
2faf91fbb3
am 66cbec51: am d234dc1f: Merge "Correct check of is user running"
...
* commit '66cbec512cf31228f8d86171f57cf4e3bcbbd63e':
Correct check of is user running
2014-12-04 23:24:31 +00:00
Amith Yamasani
d234dc1f20
Merge "Correct check of is user running"
2014-12-04 23:09:48 +00:00
Christoph Studer
f0dd044b2b
am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
...
* commit '51347595a3ea7749b2c771ac1e8f8f729a55e1a9':
RankingHelper: Remove STOPSHIP
2014-12-04 21:56:22 +00:00
Jinsuk Kim
0998e0dc4a
am 49216763: am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
...
* commit '4921676345a8b15eadb3ca3e72f103e09027cd1e':
CEC: Generate hotplug events upon adding listener
2014-12-04 21:56:02 +00:00
Vinit Deshpande
047efda149
am f04e214a: am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
...
* commit 'f04e214a6b949593b9ea83486223a21cc15e1fd0':
Remove notification for SoftAP turned on
2014-12-04 21:55:58 +00:00
Erik Kline
0f3c0704c5
am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '180a30aa57e0790453944533dc442704f7596f65':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:55:38 +00:00
Cheuksan Wang
412766a7d6
am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
new SMS/MMS carrier app API
2014-12-04 21:55:19 +00:00
Christoph Studer
51347595a3
am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
...
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
RankingHelper: Remove STOPSHIP
2014-12-04 21:46:32 +00:00
Jinsuk Kim
4921676345
am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
...
* commit '92a4627250d74264719eff3ade798a9f4480ed5a':
CEC: Generate hotplug events upon adding listener
2014-12-04 21:46:08 +00:00
Vinit Deshpande
f04e214a6b
am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
...
* commit 'aefb79b2dd13047630ba455d5a3aec8084c1d954':
Remove notification for SoftAP turned on
2014-12-04 21:46:01 +00:00
Erik Kline
180a30aa57
am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Cheuksan Wang
29ac679f9f
am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API
2014-12-04 21:45:08 +00:00
Winson Chung
e1a96f7fe2
am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
...
* commit '1c88fc009fb3f7a3b5f085abb6a40cf4d845d662':
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 21:24:02 +00:00
Winson Chung
1c88fc009f
am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
...
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
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 21:18:01 +00:00
Dianne Hackborn
722dee3e6c
am 11bee890: am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384 : Run fstrim after every system update" into lmp-mr1-dev
...
* commit '11bee890a24b05d099be87b02ea667441e573898':
Fix issue #18607384 : Run fstrim after every system update
2014-12-04 20:44:44 +00:00
Svetoslav
8d9a06feee
am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
...
* commit '6e7bf935b4adbfcc75c968f030f770af87bf6dbb':
Notify accessibility for window changes after an app animation end.
2014-12-04 20:36:52 +00:00
Svetoslav
6e7bf935b4
Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
2014-12-04 20:29:57 +00:00
Dianne Hackborn
11bee890a2
am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384 : Run fstrim after every system update" into lmp-mr1-dev
...
* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
Fix issue #18607384 : Run fstrim after every system update
2014-12-04 20:23:11 +00:00
Craig Mautner
0dd02334f4
am b3c60bcb: am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
...
* commit 'b3c60bcb51821116a301a30566b89878ab77d3d0':
Prevent ANR when broadcast receiver is killed
2014-12-04 19:59:15 +00:00
Craig Mautner
8432cee04f
am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
...
* commit '224904e01a2efb01c6276eb64fba531a3d30a42b':
Prevent ANR when broadcast receiver is killed
2014-12-04 19:52:21 +00:00
Craig Mautner
b3c60bcb51
am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
...
* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
Prevent ANR when broadcast receiver is killed
2014-12-04 19:51:23 +00:00
Craig Mautner
224904e01a
Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
2014-12-04 19:46:20 +00:00
Paul Jensen
461e73677d
am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
...
* commit 'efb81b9e965c4ba782151b6767e7e3df4f2cdfd2':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-04 19:33:08 +00:00
Paul Jensen
efb81b9e96
Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
2014-12-04 19:27:52 +00:00
Kenji Sugimoto
d088027ff1
Prevent ANR when broadcast receiver is killed
...
Cherry-picked from aosp
Fixes bug 18613138.
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.
As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.
Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.
Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
2014-12-04 11:02:36 -08: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
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
RoboErik
7fbcac6a03
Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
2014-12-04 17:46:41 +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
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
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
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
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
Christoph Studer
c9660bdf28
Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
2014-12-04 12:12:25 +00:00
Jinsuk Kim
f164739510
Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
2014-12-04 06:40:01 +00:00