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

153092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
39aa0d946b Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 2014-09-26 22:52:31 +00:00
Dianne Hackborn
fad079dc5d More debugging for issue #17656716: Unhandled exception in Window Manager 
Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
 2014-09-26 15:46:24 -07:00
Eino-Ville Talvala
56fbbeab79 Camera2: Fix parallel session and device close() exception 
It's possible for the device to have close() called on it
during the session close sequence such that the session still
tries to do a stream reconfiguration on the closed device.

Handle the exception thrown by this attempt.

Bug: 17661765

Change-Id: Iee63c5c559405abe5c044ae251ad56edd1fb3e79
 2014-09-26 15:37:26 -07:00
Igor Murashkin
e014f23e92 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:26:00 +00:00
Svetoslav
b3ba1d4e71 Accessibility node provider getting invalid virtual view id. 
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
 2014-09-26 15:23:36 -07:00
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch 
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
 2014-09-26 22:23:33 +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
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device. 
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
 2014-09-26 15:18:20 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active 
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
 2014-09-26 14:53:06 -07:00
Fabrice Di Meglio
c410968871 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 20:56:54 +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
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
John Spurlock
3b366bc3bc am 055abed6: Merge "Avoid dozing in car mode." into lmp-dev 
* commit '055abed6776d56b84f683a3e9b91a92ed23208d5':
  Avoid dozing in car mode.
 2014-09-26 20:16:07 +00:00
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
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
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
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
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
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07: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