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

170405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
f128225f93 am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 
* commit 'a32933fdfe5909de63b938b65ec0d74297d0800d':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-12-05 21:40:37 +00:00
Craig Mautner
7978f60b9e am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 
* commit '95cce9d57e627a86f612bf402b3338a6a1a1eae3':
  Avoid system server crash due to package removed
 2014-12-05 21:40:32 +00:00
Craig Mautner
655dd3eb17 am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit '435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-05 21:40:26 +00:00
Craig Mautner
004540260c am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
  [ActivityManager] Fix NPE when start activity
 2014-12-05 21:40:21 +00:00
David Friedman
278fd97a00 am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
  Change notes for NDK r10d, to publish to DAC
 2014-12-05 20:19:43 +00:00
Geoff Mendal
cf6821a942 am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
  Import translations. DO NOT MERGE
 2014-12-05 20:19:37 +00:00
David Friedman
b69f1f0b6c am 29b04001: 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 '29b040019226d7d02a57fe76a471465d16109f0b':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-05 20:19:30 +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
Justin Harrison
ff4f24866c am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '2b236ab30e479d22c0619670a97c90993307a190':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 20:19:10 +00:00
Craig Mautner
e1d4b9fab1 am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 
* commit '8432cee04f2ec4bf77a3ba84524148b78db7ea57':
  Prevent ANR when broadcast receiver is killed
 2014-12-05 20:18:58 +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
Prerepa Viswanadham
12120998f8 am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-05 20:18:38 +00:00
Adam Powell
1962353873 am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView
 2014-12-05 19:39:25 +00:00
Adam Powell
b3b4f83702 am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView
 2014-12-05 19:32:13 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Adam Lesinski
e97908d32e Merge commit '0953ab27' into manualmerge 
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
 2014-12-05 11:06:21 -08:00
Christoph Studer
501bf216dc am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev 
* commit '3bf7b80e48eb58254a076f5363f1e9e3348abb8c':
  Log the state of the notification shade
 2014-12-05 15:52:00 +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
Justin Harrison
b1ab736f48 am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'fdb33a08266d95c338c141446c1da09108194281':
  Revert "Improve fling physics for recents"
 2014-12-05 15:51:33 +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
66cbec512c am d234dc1f: Merge "Correct check of is user running" 
* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
  Correct check of is user running
 2014-12-04 23:15:47 +00:00
Amith Yamasani
d234dc1f20 Merge "Correct check of is user running" 2014-12-04 23:09:48 +00:00
Mike Lockwood
a6e14c8293 am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
  Dont call close in in BluetoothA2dp finalize
 2014-12-04 22:45:07 +00:00
Craig Mautner
a32933fdfe am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 
* commit 'e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-12-04 21:58:13 +00:00
Craig Mautner
95cce9d57e am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 
* commit '93d47b4c05585c37117ac5ac44d810de63f9d008':
  Avoid system server crash due to package removed
 2014-12-04 21:58:07 +00:00
Craig Mautner
e0dc40c0f2 Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 2014-12-04 21:50:46 +00:00
Craig Mautner
93d47b4c05 Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 2014-12-04 21:50:15 +00:00
Mike Lockwood
75b2557725 am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit '448403b7a4b2126e79121482d1fb2894133dfa25':
  Dont call close in in BluetoothA2dp finalize
 2014-12-04 21:49:56 +00:00
Craig Mautner
435496e1ac am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit 'c2cae50b832753dea612db575c6d97b8d94eceea':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-04 21:49:50 +00:00
Craig Mautner
1d8b27bced am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1289a3b2d3ae6ba67215d984c3302bfdcd69ae14':
  [ActivityManager] Fix NPE when start activity
 2014-12-04 21:49:44 +00:00
Jorim Jaggi
638e8068d2 am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
  Improve fling physics for recents
 2014-12-04 21:47:35 +00:00
Jorim Jaggi
b6d16dc53f am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'd3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
  Fix rounded corners in bottom QS panel.
 2014-12-04 21:47:28 +00:00
Derek Sollenberger
203c817180 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 21:46:39 +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
Deepanshu Gupta
9c403d8513 am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '43d0e67573e8122d9e75accb00eaa453e2755713':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:46:26 +00:00
Deepanshu Gupta
940a1e563f am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
  Fix AnalogClock rendering
 2014-12-04 21:46:20 +00:00
Deepanshu Gupta
028df22fd7 am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
  Fix typos in previous bugfixes.
 2014-12-04 21:46:14 +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
Geoff Mendal
72142eb12a am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:55 +00:00
Geoff Mendal
9088853d70 am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7b52575212ca00f7c52222f1129a0f64e061095':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:48 +00:00
Geoff Mendal
91b95c9612 am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '5d1f68803488677637b1f383d0f1162a896a9684':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:42 +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
John Spurlock
c82144fd8f am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '959312701f55c9d098403c332b88b5777daf4e4c':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:45:26 +00:00
Craig Mautner
c2cae50b83 Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 2014-12-04 21:45:21 +00:00
Pavel Zhamaitsiak
10f47f9233 am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '38916819693a69fbc882ac509e60ef0b6419c5dc':
  IMS Call End Cause Additions
 2014-12-04 21:45:21 +00:00
duho.ro
7c6144730b am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '36ccf75bb26604786f1d99ab1703ba01f8c3290c':
  UICC : discard language setting of SIM
 2014-12-04 21:45:14 +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