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

61599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Gruber
50c6dd0fd5 am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit '9d3dffc7b05dbbad4a5e597fa964398b827ba945':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 14:53:48 -08:00
Scott Main
309643d93a am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit 'fa847110524512b4bb1cb8e655471d324aba69ff':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 14:53:46 -08:00
Fred Chung
7f9c1c67ef am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit 'c2c77700fbab25bc48002a46a6c0d8a81008030c':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 14:53:45 -08:00
Robert Ly
57e16ed5f6 am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '0a2da86346f1f74b66425565e783efb2d5239f25':
  docs: adt 15.0.1 rel notes
 2011-11-17 14:53:43 -08:00
Bill Gruber
9d3dffc7b0 am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 14:49:32 -08:00
Scott Main
fa84711052 am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 14:49:28 -08:00
Fred Chung
c2c77700fb am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 14:49:26 -08:00
Robert Ly
0a2da86346 am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes
 2011-11-17 14:49:21 -08:00
Christopher Tate
7d9971213f am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 
* commit '4cf1656e10514d0575304d5a8108bc7a0b7384ed':
  Add a few GC-flexing microbenchmark tests
 2011-11-17 14:45:26 -08:00
Christopher Tate
4cf1656e10 Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 2011-11-17 14:43:17 -08:00
Christopher Tate
4c18ad56f7 Add a few GC-flexing microbenchmark tests 
Added ObjectGc and FinalizingGc to stress single-object allocation and
collection with/without the presence of finalizers.

Also added GcOp() to the menu of available single-shot tests.

Change-Id: I36d3254dfe2e97e504f9e4f77c8addda98ab4f4b
 2011-11-17 14:07:58 -08:00
Jake Hamby
2084d20668 am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 
* commit '0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
  Re-enable vril-dump for adb bugreport.
 2011-11-17 13:55:29 -08:00
Jake Hamby
0f3570c3c1 Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 2011-11-17 13:53:17 -08:00
Jake Hamby
9c27e36eca Re-enable vril-dump for adb bugreport. 
vril-dump was causing adb bugreport to hang on Xoom. The OEM fixed
the utility and we can now run it again as part of the bug report.

Bug: 5482585
Change-Id: I1db3b50c327d50d18fb9c6327c4cd521e09f3916
 2011-11-17 13:20:35 -08:00
Matthew Xie
a4f5c425b8 am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
  Check the bluetooth state for getUuid call
 2011-11-17 13:12:39 -08:00
Matthew Xie
2b9af44e40 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
 2011-11-17 13:10:14 -08:00
Nick Pelly
c6a0277bca am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.
 2011-11-17 12:51:18 -08:00
Nick Pelly
63b7360e9d Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
David Brown
19a57bdedf am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1 
* commit '1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
  SIP addresses containing "911" shouldn't be considered emergency calls
 2011-11-17 12:35:26 -08:00
David Brown
1733a3de8c Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1 2011-11-17 12:33:00 -08:00
Dave Santoro
60e345a9a9 am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.
 2011-11-17 12:27:44 -08:00
Dave Santoro
9be4962060 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
5397bb52fb am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
 2011-11-17 12:25:06 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
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
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
Dave Santoro
098d466a25 Unhide social stream permissions. 
Bug 5569021

Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
 2011-11-17 11:02:03 -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
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
Robert Ly
4f36174118 Merge "docs: adt 15.0.1 rel notes" into ics-mr0 2011-11-17 07:17:04 -08:00
Ben Murdoch
e6269f7988 am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:15:40 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:13:19 -08:00
Jeff Sharkey
66b570c704 am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
 2011-11-16 23:01:15 -08:00
Jeff Sharkey
b9df01d396 Merge "Update NTP outside locks, log large trim events." into ics-mr1 2011-11-16 22:59:13 -08:00
Daniel Sandler
a092482c17 am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-16 22:35:30 -08:00
Daniel Sandler
7fd3ba9149 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
 2011-11-16 22:35:28 -08:00
Daniel Sandler
293f861aab Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 2011-11-16 22:33:55 -08:00