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

62397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
fbd8549112 am ff31a5b1: am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised 
* commit 'ff31a5b1566a7a3eaaf75fa67db11b8cadacf453':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 15:56:43 -08:00
Bill Gruber
b14cf8af50 am dbda791f: am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit 'dbda791f3a77449b023fe0062895510e95da73dd':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 15:56:41 -08:00
Bill Gruber
289242ed97 am 50c6dd0f: am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit '50c6dd0fd5f7842bfbdc54ddbb134be883b52c41':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 15:56:39 -08:00
Scott Main
47df7ee84c am 309643d9: am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit '309643d93afd877b279acbe298b2258b62f67f53':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 15:56:37 -08:00
Fred Chung
fb7dca80a5 am 7f9c1c67: (-s ours) am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit '7f9c1c67ef135a5e7b8226a0003df525adc2593c':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 15:56:36 -08:00
Robert Ly
57ce980459 am 57e16ed5: am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '57e16ed5f6c254b8b59d1effec2c4a8f3f43eac8':
  docs: adt 15.0.1 rel notes
 2011-11-17 15:56:34 -08:00
Christopher Tate
7c37ce8b01 am 7d997121: am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 
* commit '7d9971213ff8fbfd41fa7039300ac28f555f43be':
  Add a few GC-flexing microbenchmark tests
 2011-11-17 15:56:28 -08:00
Jake Hamby
a4d76b81a5 am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 
* commit '2084d20668a79e5a31ec7365652434ec943503ef':
  Re-enable vril-dump for adb bugreport.
 2011-11-17 15:56:25 -08:00
Nick Kralevich
8549aeea0a Merge "Rename EntropyService to EntropyMixer" 2011-11-17 15:30:46 -08:00
Matthew Xie
a5ca41e9cc am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit 'a4f5c425b822a46fc49bc87bba82688570584ff1':
  Check the bluetooth state for getUuid call
 2011-11-17 15:13:03 -08:00
Nick Pelly
f955d057dd am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.
 2011-11-17 15:12:56 -08:00
David Brown
85a80ba8cd am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1 
* commit '19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
  SIP addresses containing "911" shouldn't be considered emergency calls
 2011-11-17 15:12:54 -08:00
Dave Santoro
c5b057f423 am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
  Unhide social stream permissions.
 2011-11-17 15:12:52 -08:00
Michael Kolb
778f146cf4 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
 2011-11-17 15:12:49 -08:00
Jeff Sharkey
f0c22dc4a0 am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
  Only write network stats when already loaded.
 2011-11-17 15:12:45 -08:00
Scott Main
ff31a5b156 am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code 
* commit '85c7394836843b2cbfa2b51504448794a6071b3a':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 14:53:51 -08:00
Bill Gruber
dbda791f3a am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit 'be0dab485680fb264458f8192b3759b002450102':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 14:53:50 -08:00
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
Alex Sakhartchouk
94b064e112 Merge "adding benchmark single test" 2011-11-17 14:52:23 -08:00
Scott Main
85c7394836 am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio 
* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 14:49:36 -08:00
Bill Gruber
be0dab4856 am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 14:49:33 -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
Alex Sakhartchouk
37333001cb adding benchmark single test 
Change-Id: I902579085bfee2f0bdc0bf4f38442f2f1569bf71
 2011-11-17 14:08:47 -08:00
Glenn Kasten
aba3d10f37 Merge "Bug 5522189 re-enable ARM opts but disable inline" 2011-11-17 14:08:31 -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
Nick Kralevich
6967cbc959 Rename EntropyService to EntropyMixer 
EntropyService implies that this program provides entropy to other
programs, and is misleading. The EntropyMixer class is designed purely
to stir the existing entropy pool with some possibily random-ish data,
and carryover entropy across device reboots.

Change-Id: I086cd339a3b652d32371521e61e1b1f555ce2280
 2011-11-17 13:29:58 -08:00
Glenn Kasten
cd498c3f2d Bug 5522189 re-enable ARM opts but disable inline 
PIE did not work together with inlining.  This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.

Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
 2011-11-17 13:27:22 -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
Amith Yamasani
16991b1438 am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit '664bb774f528fead63d7c0e62b533da66390b246':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 13:20:22 -08:00
Fred Chung
66f5cf4d29 am a8f7b7c4: am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit 'a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 13:20:19 -08:00
Andreas Huber
aa25761114 am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 13:20:16 -08:00
John Reck
a93a7d6d15 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
 2011-11-17 13:20:15 -08:00
John Reck
6810017f6a am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
 2011-11-17 13:20:12 -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
Scott Main
08d40d7180 Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0 2011-11-17 12:32:11 -08:00