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

153732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
245bd4ec8a Merge "Avoid dozing in car mode." into lmp-dev 2014-09-26 20:09:58 +00:00
Dianne Hackborn
f051b703db am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:07:46 +00:00
John Spurlock
a6e9e79a1f am f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev 
* commit 'f60d00328c2bd3b34aaaaadf157621e874d6c664':
  Touch-exploration improvements to volume dialog.
 2014-09-26 20:07:42 +00:00
Kevin Ma
cd6facc0a1 am a782cd68: am 666f2a91: am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit 'a782cd6822bb076460bd02811584b468e626b01d':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 20:07:15 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Kevin Ma
7119aec1c6 am 666f2a91: am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '666f2a918e9cca6f0e219d0abb7ac250953f9f24':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 20:00:16 +00:00
John Spurlock
bd721cafc4 Merge "Touch-exploration improvements to volume dialog." into lmp-dev 2014-09-26 19:58:45 +00:00
Dave Burke
f0e47946a8 am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 
* commit 'd84ab8b128157d60bc1d4dad6f6223e1f174e188':
  Revert "Fix memory leak where we close the descriptor instead of the file."
 2014-09-26 19:53:18 +00:00
Dan Sandler
19f68fb871 am 8d1b0035: am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev 
* commit '8d1b0035aa8fd147f0f6841cfac1c48158b78c9e':
  Don't start the keyguard until boot is done.
 2014-09-26 19:53:14 +00:00
Alan Viverette
9584232706 am a53b5408: am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 
* commit 'a53b54087ecfde6fcadcf8632f7dd3ad7c339e2e':
  Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
 2014-09-26 19:53:11 +00:00
Michael Wright
4a1d3d9a4d am b0ce3099: am ff0384fa: Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 
* commit 'b0ce3099bb0d2c48ac66eb265572dfe454b4dcdb':
  Turn the device on if the camera lens is uncovered.
 2014-09-26 19:53:07 +00:00
Martijn Coenen
e20f9aa316 am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:53:03 +00:00
Paul Lawrence
ac28e40aa9 am 1623fd7d: am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev 
* commit '1623fd7d3075c6239d1245abfc9ca3696c1fad6c':
  Don't set dev.bootcomplete until interacting with user
 2014-09-26 19:52:59 +00:00
Jorim Jaggi
b56ec7fc26 am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
  Don't preload task description icons when opening recents
 2014-09-26 19:52:56 +00:00
Selim Cinek
8e193fc1aa am 144341e8: am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev 
* commit '144341e88a215113af5622793f14a0a40cd10f6c':
  Fixed a bug where the QS could get stuck
 2014-09-26 19:52:52 +00:00
Raph Levien
a4e3a616cd am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit '02366924dfd8c0ae2c61f87a92c0b6a24a852f29':
  Defer spelling correction with apostrophe
 2014-09-26 19:52:48 +00:00
Selim Cinek
b32e372ef5 am 8d6d6478: am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit '8d6d64789ae83a5a8e2ca96196145c9128108c82':
  Fixed a crash with disapearing views
 2014-09-26 19:52:44 +00:00
Kenny Guy
24bea65421 am 420050d8: am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit '420050d8ccfbb21b491aa67d84a771907f28b744':
  Uninstall for all users should check device admins.
 2014-09-26 19:52:40 +00:00
RoboErik
9ea363b0fd am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '66bc433a10b9742a6b0864abe75bbbed2468a997':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 19:52:36 +00:00
RoboErik
12cb62f8c2 am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '7d111759e90abe9ec0e66f4231c252f924f6d7b0':
  Remove BT routes when BT is turned off
 2014-09-26 19:52:31 +00:00
Selim Cinek
fc1bee6c42 am edccb1be: am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 
* commit 'edccb1be4f9a83c80b3117054c16678762c496c5':
  Increased the falsing threshold when woken up by touch
 2014-09-26 19:52:28 +00:00
Kevin Ma
17a757d9be am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '938ff081a61d31e5eefca7cee582002aea1c06ff':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:52:06 +00:00
xinhe
31a5a1c15c am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit '53ba6368fe84513f0cd2726938fbf8838dcf68b3':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 19:47:02 +00:00
Deepanshu Gupta
190272c2d3 am 7ea2dfa4: am 351b7982: am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list a 
* commit '7ea2dfa45e33fe366a781d7d7d420a926ff62367':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:59 +00:00
Deepanshu Gupta
d10962dda3 am 3eb32ab6: am 3f86a402: am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '3eb32ab6bd660ca95f85d3ccaacd0d700b1224b1':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:55 +00:00
Deepanshu Gupta
7e664b0b30 am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8b56400834887a39a9e8d04f0b21a424a194986f':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:52 +00:00
Justin Koh
421b4de3fb am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit 'ac32ca7e0cc54b1b2a46e6fe404a60a61abd86bd':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 19:46:49 +00:00
Craig Mautner
fb5d979462 am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '45919a431ec2433971b0bb3e118e307f07f6dcf0':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 19:46:45 +00:00
Deepanshu Gupta
340a09688e am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '55ee2bbb97a35b92d610d12c2c58e6741d831c3e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:42 +00:00
Deepanshu Gupta
27c40454dc am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'dd06bba1a3936cb4a30bf7fc0775a4aa5485c1b9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:39 +00:00
Kevin Ma
938ff081a6 am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:43:39 +00:00
Dave Burke
762c1cfdd2 am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 
* commit 'e09e20eeca4b822855e02507a4e30387ea4ee1a6':
  Revert "Fix memory leak where we close the descriptor instead of the file."
 2014-09-26 19:43:19 +00:00
Dan Sandler
b30ea7f62c am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev 
* commit '7b7ef437e5b46d1173a7458ada6520778284c91a':
  Don't start the keyguard until boot is done.
 2014-09-26 19:43:16 +00:00
Alan Viverette
6f65a96ca1 am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 
* commit '81e2f789029701b569d3c0deee8bc74fbebab5db':
  Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
 2014-09-26 19:43:12 +00:00
Michael Wright
c301325602 am ff0384fa: Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 
* commit 'ff0384fa37801b82517897c3d0b03982d443e3c7':
  Turn the device on if the camera lens is uncovered.
 2014-09-26 19:43:08 +00:00
Martijn Coenen
a751e2aa37 am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:43:03 +00:00
Paul Lawrence
6ab202a1a9 am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev 
* commit '3f105532ddfd55dc9fa287bf03a751922df3bd9d':
  Don't set dev.bootcomplete until interacting with user
 2014-09-26 19:42:59 +00:00
Jorim Jaggi
875db8db40 am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
 2014-09-26 19:42:55 +00:00
Selim Cinek
92ddf2a0f4 am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev 
* commit '9583b5a98dc265158c667a57092688407014b9b6':
  Fixed a bug where the QS could get stuck
 2014-09-26 19:42:51 +00:00
Raph Levien
e430e9bba6 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:42:46 +00:00
Selim Cinek
8f37f2b85d am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit '7f8acb8f03987a9e9f0f77c3e2500a82f1cee029':
  Fixed a crash with disapearing views
 2014-09-26 19:42:42 +00:00
Kenny Guy
c0ee08d3c4 am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit '25be3cd6719af42c41a6a99eea1034b00f39a825':
  Uninstall for all users should check device admins.
 2014-09-26 19:42:38 +00:00
RoboErik
fd0136e978 am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit 'cab05d54baa53bc542fa35f33e612f2c41746307':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 19:42:33 +00:00
RoboErik
d787eae955 am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit 'c80873d5fa3976c5f6c238fdc98d67bc22cddb72':
  Remove BT routes when BT is turned off
 2014-09-26 19:42:29 +00:00
Selim Cinek
66eab81ef7 am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 
* commit 'a98272456d72460e010d9b7206f82414b7d5034e':
  Increased the falsing threshold when woken up by touch
 2014-09-26 19:42:26 +00:00
Dave Burke
6bf7be3b75 Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 2014-09-26 19:33:27 +00:00
Dan Sandler
22ef3ed305 Merge "Don't start the keyguard until boot is done." into lmp-dev 2014-09-26 19:32:26 +00:00
Jérôme Poichet
d29c902f98 Revert "Fix memory leak where we close the descriptor instead of the file." 
This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.

Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
 2014-09-26 18:59:11 +00:00
Kevin Ma
18037f14e8 Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 2014-09-26 18:52:25 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths"" 
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
 2014-09-26 18:51:16 +00:00