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

157437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
e14facba6d am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:29:20 +00:00
Igor Murashkin
381d22f706 Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 2014-09-26 22:20:12 +00:00
Fabrice Di Meglio
558e64b39f am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:58:08 +00:00
John Spurlock
355f6688ae am 055abed6: Merge "Avoid dozing in car mode." into lmp-dev 
* commit '055abed6776d56b84f683a3e9b91a92ed23208d5':
  Avoid dozing in car mode.
 2014-09-26 21:57:57 +00:00
Dianne Hackborn
c29de2ffb2 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 21:57:49 +00:00
John Spurlock
01c5286e2e am f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev 
* commit 'f60d00328c2bd3b34aaaaadf157621e874d6c664':
  Touch-exploration improvements to volume dialog.
 2014-09-26 21:57:45 +00:00
Kevin Ma
40c95bb207 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 21:57:36 +00:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis 
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
 2014-09-26 13:38:12 -07:00
John Spurlock
245bd4ec8a Merge "Avoid dozing in car mode." into lmp-dev 2014-09-26 20:09:58 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
John Spurlock
bd721cafc4 Merge "Touch-exploration improvements to volume dialog." into lmp-dev 2014-09-26 19:58:45 +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
Dave Burke
aef681506c 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:44:16 +00:00
Dan Sandler
20895a7973 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:44:12 +00:00
Alan Viverette
571cd7e938 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:44:08 +00:00
Michael Wright
97e2ef03d6 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:44:02 +00:00
Martijn Coenen
d1398c5eda 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:58 +00:00
Paul Lawrence
c05c8621bd 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:43:53 +00:00
Jorim Jaggi
2ef12e4a5c 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:43:50 +00:00
Selim Cinek
d3581078db 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:43:45 +00:00
Raph Levien
5d8fa6c173 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:43:41 +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
Selim Cinek
9b4af55aa9 am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit '7f8acb8f03987a9e9f0f77c3e2500a82f1cee029':
  Fixed a crash with disapearing views
 2014-09-26 19:43:37 +00:00
Kenny Guy
fb81844bc6 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:43:33 +00:00
RoboErik
deadb32736 am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit 'cab05d54baa53bc542fa35f33e612f2c41746307':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 19:43:28 +00:00
RoboErik
9eb73b705d 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:43:25 +00:00
Selim Cinek
76de8226a8 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:43:20 +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
Alan Viverette
a0f63c6e95 Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 2014-09-26 18:45:26 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints... 
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
 2014-09-26 11:28:01 -07:00
John Spurlock
a0457c2e92 Touch-exploration improvements to volume dialog. 
- Extend the dismiss timeout when interacting with various
   subcontrols.
 - Ensure "hover" events in touch exploration extend the timeout
   in addition to touch events.
 - Introduce new helper to standardize interaction callbacks.
 - Announce zen toasts.
 - Announce zen condition selections, and when existing countdown
   conditions are modified.

Bug:17578434
Change-Id: I8a055b3455aa8d20ba93439bdec6cc75db97800e
 2014-09-26 14:17:09 -04:00
Michael Wright
1b409bcfb8 Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 2014-09-26 18:13:55 +00:00
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +00:00
Paul Lawrence
3cedef53ce Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev 2014-09-26 17:58:26 +00:00
Jorim Jaggi
e51b21a81e Merge "Don't preload task description icons when opening recents" into lmp-dev 2014-09-26 17:57:05 +00:00
Alan Viverette
5004032ebc Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD 
BUG: 17646144
Change-Id: I58c111d86224dc8f7f557073c0bcbc22ad74aa1b
 2014-09-26 10:37:30 -07:00
Paul Lawrence
95cce9f382 Don't set dev.bootcomplete until interacting with user 
Specifically we want to not set it when encrypting and showing
progress.

Bug: 17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
 2014-09-26 10:16:45 -07:00
Selim Cinek
17580af3cb Merge "Fixed a bug where the QS could get stuck" into lmp-dev 2014-09-26 17:14:17 +00:00
Raph Levien
c8ffeeca67 Merge "Defer spelling correction with apostrophe" into lmp-dev 2014-09-26 17:12:49 +00:00
Selim Cinek
1fdd65e204 Fixed a bug where the QS could get stuck 
Bug: 17655858
Change-Id: I099b07504617670101b10bcbaf9fcb42cee23a1c
 2014-09-26 19:05:50 +02:00
Jorim Jaggi
bdd4b201e4 Don't preload task description icons when opening recents 
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
 2014-09-26 19:00:05 +02:00
Jason Monk
5eeebf5c29 Don't start the keyguard until boot is done. 
Create the KeyguardServiceDelegate but don't bind until boot is done.
Until the keyguard is bound, the delegate will assume it should be
in a secure state.

Bug: 17464800
Change-Id: I91650d1e3e3ea993168855bc3444b905aac9aac3
 2014-09-26 12:53:29 -04:00
Selim Cinek
7e3bfca8d0 Merge "Fixed a crash with disapearing views" into lmp-dev 2014-09-26 16:50:36 +00:00
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00