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

170335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00
John Reck
a75b0ad384 resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp 
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
 2014-12-04 13:41:04 -08: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
Jim Miller
d205d407b4 am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
  Stop keyguard from spamming the log
 2014-12-04 21:17:55 +00:00
xinhe
c377c360e9 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:17:50 +00:00
Wink Saville
58a3561f74 am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '0304c529b6a166547aaf104a46bc876780ba7416':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:17:43 +00:00
Christopher Tate
dff5580711 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:17:37 +00:00
Geoff Mendal
348b03bff4 am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:28 +00:00
Geoff Mendal
a79eea5c97 am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b05d2bd6fe7a674537dc87aade5673746c96780':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:11 +00:00
Geoff Mendal
a786837be8 am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2253b8c576182256139a9b18195aef451f7e134a':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:01 +00:00
Robert Greenwalt
83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type
 2014-12-04 20:23:55 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:23:25 +00:00
Alan Viverette
979ed5140b am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '3977137d865637297b4723ec8784d5b97fc316dc':
  Slightly more button elevation to match Material spec
 2014-12-04 20:23:18 +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
Yin-Chia Yeh
e168dd28f8 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec
 2014-12-04 20:23:00 +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
Chih-hung Hsieh
e762f986c4 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:51:15 +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