ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,094 Commits 2 Branches 0 Tags 54 MiB
4e8650d546
Commit Graph

41094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
4e8650d546 Merge "Clean up GenerationCache." 2011-11-14 18:28:59 -08:00
Steven Ross
989be2ec04 Merge "Making KeyguardView slippery fixes 5501105" 2011-11-14 16:56:46 -08:00
Jim Miller
56abf09f6b am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:21:10 -08:00
Jim Miller
4cc7ceea88 am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens
 2011-11-14 16:16:28 -08:00
Jim Miller
772deeafa3 Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1 2011-11-14 16:14:07 -08:00
Tsu Chiang Chuang
7bda79a928 am 8340db9e: am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '8340db9e9b3363924b47f4d67d57ddb19a4c7702':
  Adding mobile microbenchmark tests.
 2011-11-14 14:41:05 -08:00
Tsu Chiang Chuang
0fccb0ad90 am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1 
* commit '6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
  Adding mobile microbenchmark tests.
 2011-11-14 14:38:31 -08:00
Adam Cohen
1ca1c901a5 am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 
* commit '621f971691e3e819ddcd95898f4f93498e00c2ad':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
 2011-11-14 14:38:30 -08:00
Jean-Michel Trivi
446eb2beed am 9d36a995: am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '9d36a99582518ed1a7fb005382e0128479b43e18':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:38:30 -08:00
Adam Cohen
368df1fc1f am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 
* commit '6066a2b4de36549b7d8fe36507b7254e501f0b28':
  Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
 2011-11-14 14:35:57 -08:00
Tsu Chiang Chuang
4464cb95f8 Merge "Adding mobile microbenchmark tests." into ics-mr1 2011-11-14 14:35:42 -08:00
Adam Cohen
d81ebb4661 Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 2011-11-14 14:33:06 -08:00
Jean-Michel Trivi
153ede4231 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 12:33:20 -08:00
Jean-Michel Trivi
071313e671 Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 2011-11-14 12:31:10 -08:00
Dave Burke
d798169fad am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 
* commit '2cfb873c9f0b56f2c7d694a21c968511223933af':
  Revert "Discard framebuffer rendering queues when discarding layers"
 2011-11-14 12:30:04 -08:00
Dave Burke
0d989f256a am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 
* commit '9d66da8ae61a8520f46ee7df3cbb374852d9da91':
  Revert "Discard framebuffer rendering queues when discarding layers"
 2011-11-14 12:27:34 -08:00
Dave Burke
2248017d03 Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1 2011-11-14 12:25:53 -08:00
John Wang
e42adac546 am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 
* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues
 2011-11-14 12:14:09 -08:00
John Wang
33ccc4353f am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1 
* commit '72a31ab98f8687aa48fce028d54e79929780a302':
  [maguro] Fix STK issues
 2011-11-14 12:11:35 -08:00
John Wang
82e11a5992 Merge "[maguro] Fix STK issues" into ics-mr1 2011-11-14 12:10:16 -08:00
Mathias Agopian
8c11963dda am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 
* commit '738d8cae2239d194429676f2889cfae3c8f7ba08':
  Define, document, and test the behavior of very large SurfaceTextures
 2011-11-14 11:54:38 -08:00
Mathias Agopian
9eb4fc62ee am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 
* commit 'c93a151fde7d616c22b86ae458b3d015e3820d5e':
  Define, document, and test the behavior of very large SurfaceTextures
 2011-11-14 11:51:48 -08:00
Mathias Agopian
c17c19e405 Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1 2011-11-14 11:49:42 -08:00
Glenn Kasten
7591efc111 Merge "Don't check return value of new for being == null" 2011-11-14 10:50:33 -08:00
Alex Sakhartchouk
91fa3b91b3 am f579bb92: am cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1 
* commit 'f579bb92c2032cd27aef72a1654c006933b22bbd':
  Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
 2011-11-14 10:39:08 -08:00
Alex Sakhartchouk
ca8b5f60de am cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1 
* commit 'cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
  Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
 2011-11-14 10:37:21 -08:00
Alex Sakhartchouk
a38658ffae Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1 2011-11-14 10:35:08 -08:00
Eric Laurent
e3b191cbe9 am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:41:40 -08:00
Eric Laurent
f661c97f4c am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
  audioflinger: fix noise when skipping to next song
 2011-11-14 08:39:33 -08:00
Eric Laurent
9f95f9bee4 Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 2011-11-14 08:38:05 -08:00
Mathias Agopian
3ca026f63c am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 
* commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
 2011-11-14 07:49:07 -08:00
Scott Main
da9cff678d am 807c07b5: am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '807c07b564564b6f5cf3711e4743de9c25a38175':
 2011-11-14 07:49:06 -08:00
Jeff Brown
7ed8b8e53a am ffa5d463: am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit 'ffa5d463c36e2127ff10a03ee49f0677567c02c1':
 2011-11-14 07:49:04 -08:00
Adam Powell
3fceff9934 am ec44bdaa: (-s ours) am 771d0c99: am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0 
* commit 'ec44bdaaadcceaae8ab6fe5c4bd17d59fc00d7e3':
 2011-11-14 07:49:03 -08:00
Robert Ly
33c2d53b18 am 19aa78a4: am 632f072b: am 5f8b7269: docs: fix typo 
* commit '19aa78a40316b31531c57f1bf222e0bf2d1b5673':
 2011-11-14 07:49:01 -08:00
Robert Ly
6d949beb92 am fafda521: am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit 'fafda5210f54705fdf36baeee0064d46e6e1994e':
 2011-11-14 07:49:00 -08:00
Adam Powell
8327c0cf8d am b22eec57: am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-14 07:48:58 -08:00
Mathias Agopian
c6443d952c am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 
* commit '2858749704ea7b130499cf2ac7b3e1c3331f1582':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
 2011-11-14 07:46:03 -08:00
Scott Main
d150c70816 am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
 2011-11-14 07:46:03 -08:00
Jeff Brown
d2fada6e37 am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
 2011-11-14 07:46:02 -08:00
Adam Powell
6cc3f244a6 am 771d0c99: am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0 
* commit '771d0c99f6433c3ad7063cdfa847c9476ef0453c':
 2011-11-14 07:46:01 -08:00
Robert Ly
52f9cce6c5 am 632f072b: am 5f8b7269: docs: fix typo 
* commit '632f072b223f5f682f4152551a61cec2456b2186':
 2011-11-14 07:46:01 -08:00
Robert Ly
7bd19bd649 am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
 2011-11-14 07:46:00 -08:00
Adam Powell
df6e917b18 am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-14 07:46:00 -08:00
Kristian Monsen
cf96735f54 Merge "Removing the ability to get native instrumentation as part of nav dump" 2011-11-14 04:28:32 -08:00
Mathias Agopian
203ad02a17 Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1 2011-11-14 00:52:09 -08:00
Jeff Brown
b4293fe408 Clean up GenerationCache. 
Use const references to keys and values where appropriate to avoid
copying them unnecessarily.

Deleted some dead code.

Simplified a few pieces that were doing unnecessary redundant work.

Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
 2011-11-11 22:14:07 -08:00
Scott Main
8a566dc98f am 30870e32: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0 
* commit '30870e32de4d7338d0aa957458ec63df9806f9da':
  Docs: update state list drawable with state_activated and revise selected/focused
 2011-11-11 20:37:14 -08:00
Jeff Brown
4678097aeb am 0e4669c8: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls. 
* commit '0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
 2011-11-11 20:37:12 -08:00
Adam Powell
01c727f625 am 811959f4: (-s ours) am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0 
* commit '811959f474f1b39b655935aa0ad3ab70125c992c':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-11 20:37:10 -08:00