drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,693 Commits 1 Branch 0 Tags
Commit Graph

160693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
135a576185 am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '597a75318e22ebebf9338f5dfc7d7c99aa3f23a2':
  Import translations. DO NOT MERGE
 2014-12-04 20:37:03 +00:00
David Friedman
29b0400192 am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '17904f8b9c7553601d4ec1b24356c43cb80c318f':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-04 20:36:58 +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
Geoff Mendal
597a75318e am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9ece2e960046a169ac30c4b23119052793c76d98':
  Import translations. DO NOT MERGE
 2014-12-04 20:31:29 +00:00
David Friedman
17904f8b9c am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '2d2e7bf33f2e443a650fa29ee646055b231ea380':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-04 20:30:57 +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
Justin Harrison
2b236ab30e am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '70941f203c13bbd475f2434b69155123cf5ae863':
  Revert "Revert "Improve fling physics for recents""
 2014-12-04 20:10:32 +00:00
Justin Harrison
70941f203c Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 2014-12-04 20:05:41 +00:00
Justin Harrison
31d9837284 Revert "Revert "Improve fling physics for recents"" 
This is now BC-triaged, so reverting the revert.

This reverts commit 3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e.

Change-Id: Iae9ffc74a44918a83d9cd4dfb7011810c770e135
 2014-12-04 20:05:21 +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
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
Prerepa Viswanadham
e21aafab0d am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit 'ff5e5db319785d23d672af95ac2dff3f37827cfd':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-04 19:25:02 +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
Adam Lesinski
0953ab2764 am 720beef2: Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev 
* commit '720beef28dacc924d77576f63fced84e6a820dc6':
  AAPT: Move private attrs to new type for framework
 2014-12-04 18:30:25 +00:00
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
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 00d947bda0b9a2ea133dfd7b0e445245a0e2c23c.

Change-Id: I3d6696227a381d232baed8fdbcbe34d3c4976ebe
 2014-12-04 17:37:24 +00: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
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