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

62507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
7892cbffbe am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '8ac35e30b29f3a3e81ed722621bf7f1de708455f':
  Only write network stats when already loaded.
 2011-11-17 12:11:47 -08:00
Jeff Sharkey
8ac35e30b2 Merge "Only write network stats when already loaded." into ics-mr1 2011-11-17 12:10:02 -08:00
Jeff Sharkey
c506ff6150 Only write network stats when already loaded. 
Bug: 5584564
Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
 2011-11-17 12:05:46 -08:00
Ben Murdoch
131ed03f30 am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 11:46:30 -08:00
Jeff Sharkey
ee737d9e44 am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit '66b570c70471976cd2a99825898c778a7850f2c8':
  Update NTP outside locks, log large trim events.
 2011-11-17 11:46:26 -08:00
Daniel Sandler
470dfcd030 am a092482c: am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit 'a092482c17830b985798d5da9c1d1951735bacf3':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-17 11:46:23 -08:00
Daniel Sandler
f27e94ce9d am 7fd3ba91: am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit '7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
  Disable desk dock apps.
 2011-11-17 11:46:21 -08:00
Mathias Agopian
ce51c10fc1 am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1 
* commit '2030d78dc9c20d2f561f4b11f1a1adddb63661c6':
  be a bit more defensive when parsing extension strings
 2011-11-17 11:46:20 -08:00
Nicolas Roard
0ecd89bce3 am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-17 11:46:09 -08:00
Bill Gruber
69e24843fc Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 2011-11-17 11:35:16 -08:00
Bill Gruber
ef20eb2595 Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 2011-11-17 11:34:46 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView 
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
 2011-11-17 11:08:59 -08:00
Jack Palevich
22da9a8beb Merge "Fix potential GLThread / GLSurfaceView memory leak." 2011-11-17 11:05:30 -08:00
Dave Santoro
098d466a25 Unhide social stream permissions. 
Bug 5569021

Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
 2011-11-17 11:02:03 -08:00
Jesse Wilson
9ab5fa0aaa Merge "Add a link from LruCache to the Android support package (compatibility library)." 2011-11-17 10:42:48 -08:00
Jesse Wilson
02db1b6c00 Add a link from LruCache to the Android support package (compatibility library). 
Change-Id: Ibd16410856cd8a0a991b4a403fedd9ac4e1ecaad
 2011-11-17 13:40:01 -05:00
Alex Sakhartchouk
54b851c9b5 Merge "DO NOT MERGE" 2011-11-17 10:12:13 -08:00
Amith Yamasani
664bb774f5 am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 10:02:16 -08:00
Amith Yamasani
aefc0ed967 Merge "Don't upgrade some settings from GB to ICS." into ics-mr1 2011-11-17 10:01:00 -08:00
Scott Main
7d4c4721c6 docs: add sums/sizes for adt 15.0.1 
Change-Id: I9dc5e429c09cb31a86d1e867f76f4d3a3997dd87
 2011-11-17 09:59:50 -08:00
Fred Chung
a8f7b7c479 am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit '3a7e2c0ba89b40b61d2322955ab895020a70592c':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 09:39:28 -08:00
Fred Chung
4750cbd931 Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 2011-11-17 09:38:10 -08:00
Fred Chung
3a7e2c0ba8 Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 2011-11-17 09:37:15 -08:00
Alex Sakhartchouk
5044556861 Merge "Fixing FBO font rendering bug that resulted from using old surface size." 2011-11-17 09:13:24 -08:00
Andreas Huber
624efe4567 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 09:07:36 -08:00
Andreas Huber
c1b1709b2f Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 2011-11-17 09:05:17 -08:00
John Reck
0551287f6e am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
  Fix add single character check
 2011-11-17 08:49:50 -08:00
John Reck
2c6afef876 am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
  Undeprecate LayoutAlgorithm
 2011-11-17 08:49:49 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
George Mount
82ed95f410 Content and viewport rects set in one step. 
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
 2011-11-17 08:31:55 -08:00
Matthew Xie
1bce803f66 am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-17 07:48:29 -08:00
Mathias Agopian
280271d1f2 am f14ce7db: am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit 'f14ce7db5dc327724984946e7754c777908cc2ad':
  remove hack that hardcoded the refresh rate
 2011-11-17 07:48:27 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
 2011-11-17 07:48:24 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
 2011-11-17 07:48:17 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
 2011-11-17 07:48:15 -08:00
Daniel Sandler
0505984abb am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit 'e11bcd1d72cb45af984b9d457c4306f51923e853':
  Remove day of week from phone notification panel.
 2011-11-17 07:48:12 -08:00
Mathias Agopian
905a12a949 am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-17 07:48:10 -08:00
Marco Nelissen
5a1623b379 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
 2011-11-17 07:48:01 -08:00
Robert Ly
4f36174118 Merge "docs: adt 15.0.1 rel notes" into ics-mr0 2011-11-17 07:17:04 -08:00
Glenn Kasten
7418e385f4 Merge "MidiFile uses C++ Thread not createThreadEtc" 2011-11-17 07:14:41 -08:00
Glenn Kasten
b447e9ce1d Merge "JetPlayer uses C++ Thread not createThreadEtc" 2011-11-17 07:14:29 -08:00
The Android Automerger
e7d4980013 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:46:36 -08:00
The Android Automerger
91318e584b merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 06:28:25 -08:00
Dianne Hackborn
77c5f4def4 am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming. 
* commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
 2011-11-17 05:46:34 -08:00
Dianne Hackborn
7cd2b19a92 am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 
* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
 2011-11-17 05:46:32 -08:00
Robert Greenwalt
89d94e3550 am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1 
* commit '795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
  Fix TelephonyManager to grab the best context
 2011-11-17 05:46:05 -08:00
Jamie Gennis
04dd4deafd am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 
* commit '7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
 2011-11-17 05:46:00 -08:00
Eric Fischer
6c932dab1c am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '02ed923da995a10c537018861cfc149d04c66bc2':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:54 -08:00
Gilles Debunne
664d87ef01 am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
  IME action (done, next...) correctly handled
 2011-11-17 05:45:29 -08:00