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

153812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
9a957e0904 am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513 am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:59:16 +00:00
Scott Rowe
a0bdf9cce7 am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '8cfba20560314a09d7e9a2fd98355109d30d57cd':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:59:13 +00:00
Ricardo Cervera
ba32c278da am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit 'd4a2da0494f4a3d2636f7e61c36373f872039262':
  docs: Fixed path for build output.
 2014-10-01 00:59:09 +00:00
Justin Koh
870ba83b3d am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '8dd8818bdeb7b264f82da0f0854722ffd7ab7e12':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 00:59:06 +00:00
Alan Viverette
a1411fe08f am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit '52208590123210506abd2d14124bec1f07847b1f':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 00:59:02 +00:00
Alan Viverette
eca52d9171 am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit '35ebdd0514c7d3e6b2e64acb916f5160821bd463':
  Fix drawable container tinting
 2014-10-01 00:58:59 +00:00
Jean-Michel Trivi
9f1bca5f21 am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:58:55 +00:00
Dianne Hackborn
e26ba8f74f am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:58:52 +00:00
Chris Craik
d7de7b49b1 am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit '505c9d2ce0a8ed8dc27baf406f05f2ae4c265fe5':
  Implement alpha as documented for drawables
 2014-10-01 00:58:48 +00:00
Fabrice Di Meglio
b90269b095 am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'b08fc7ec1b77203d53766a1537239e30fc56890f':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 00:58:45 +00:00
Matthew Williams
d55d3c597a am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784 am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:52:34 +00:00
Scott Rowe
8cfba20560 am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:52:07 +00:00
Ricardo Cervera
d4a2da0494 am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
  docs: Fixed path for build output.
 2014-10-01 00:52:04 +00:00
Justin Koh
8dd8818bde am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '91bd87699137a4ec9f4dc249592401005303f945':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 00:52:00 +00:00
Alan Viverette
5220859012 am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit '76e15c4b3affbca016f6ecc3dbf302db9b64bbe4':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 00:51:57 +00:00
Alan Viverette
35ebdd0514 am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
  Fix drawable container tinting
 2014-10-01 00:51:37 +00:00
Jean-Michel Trivi
0ed179d185 am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:51:32 +00:00
Dianne Hackborn
069de2045e am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:51:10 +00:00
Chris Craik
505c9d2ce0 am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
  Implement alpha as documented for drawables
 2014-10-01 00:50:59 +00:00
Fabrice Di Meglio
b08fc7ec1b am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'df61d0046cb901f75d2758aa443190371b4cc746':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 00:50:56 +00:00
Chris Craik
0889780674 Merge "Add tracing for saveLayer" into lmp-mr1-dev 2014-09-30 23:06:43 +00:00
Wink Saville
fdadab4b5a Merge "Fix concurrent access violation." into lmp-mr1-dev 2014-09-30 22:30:05 +00:00
Etan Cohen
a33cf075fa Fix concurrent access violation. 
Change-Id: I8586629cafe585135f0f72ba011b65f81242fc22
 2014-09-30 22:23:49 +00:00
RoboErik
80aa626e04 am a65a4f64: am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev 
* commit 'a65a4f64e6206c370bce79d74753f6f67bc4b4e0':
  Be more paranoid about threading in MediaSessionRecord
 2014-09-30 16:43:43 +00:00
RoboErik
a65a4f64e6 am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev 
* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
  Be more paranoid about threading in MediaSessionRecord
 2014-09-30 16:32:03 +00:00
Derek Sollenberger
345effc2b2 Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev 2014-09-30 14:34:58 +00:00
Jungshik Jang
8dff369838 Merge "Update CEC keycode repeat status." into lmp-mr1-dev 2014-09-30 04:47:56 +00:00
Matthew Williams
bc156ba430 Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828 Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 2014-09-30 03:05:49 +00:00
Scott Rowe
d1462247e0 am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:53:34 +00:00
Ricardo Cervera
3910b5d2f5 am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '6ea34ddfde0aa3c60a83cc4fb7111514be97da9c':
  docs: Fixed path for build output.
 2014-09-30 00:53:23 +00:00
Justin Koh
91bd876991 am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '92ffd6b5fe11c649483c1ae53ec72a42d33629dd':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:53:19 +00:00
Alan Viverette
76e15c4b3a Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 2014-09-30 00:50:39 +00:00
Alan Viverette
b6ca2050c3 Decrease date picker height to avoid cutting off calendar 
BUG: 17696098
Change-Id: I3d97d8bcd5222bf266dfc75e89759d57ec184515
 2014-09-29 17:47:03 -07:00
Scott Rowe
6287a65cca am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
  docs: Fixed path for build output.
 2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:39:16 +00:00
Alan Viverette
b805da9b59 Merge "Fix drawable container tinting" into lmp-dev 2014-09-30 00:32:30 +00:00
Alan Viverette
bddb843e79 Fix drawable container tinting 
BUG: 17704311
Change-Id: Ib9ced41e8589352c852e6c9dc7abbe6e4b9f2520
 2014-09-29 17:22:47 -07:00
Chris Craik
a8bea8edde Add tracing for saveLayer 
bug:17702227

Change-Id: Ia9cbf31b360c93f712e021bea406cb63e4cc4c2a
 2014-09-29 17:19:05 -07:00
Jean-Michel Trivi
4a154af9aa Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 2014-09-30 00:11:14 +00:00
Dianne Hackborn
38646c19d8 Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-29 23:06:17 +00:00
Dianne Hackborn
73d6a821ae Work on issue #17656716: Unhandled exception in Window Manager 
Remove the checks for large parcel sizes.  Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.

Add logging for strict mode IPCs, since those seem to be the
problem.  Only log when things look bad.

Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.

Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
 2014-09-29 16:04:02 -07:00
Scott Rowe
294d534787 am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-29 22:53:15 +00:00
Chris Craik
e910cc8838 Merge "Implement alpha as documented for drawables" into lmp-dev 2014-09-29 22:20:43 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown 
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
 2014-09-29 15:11:46 -07:00
Fabrice Di Meglio
df61d0046c Fix bug #17682629 Crash while accessing apps' settings 
- add missing Material resource file

Change-Id: Ibf5f43c0c5a09b4e562fbe8f40778a89b560e211
 2014-09-29 21:47:09 +00:00
RoboErik
165809b331 Send volume keys to the default stream if not actually playing 
This ensures that we'll only adjust volume on a session's stream if
that stream is actually in use.

bug:17690423
Change-Id: I5fce8265a015bbc5034afa16719d9a0bbf257598
 2014-09-29 14:43:10 -07:00