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

64296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
c2df2e11bd am 8ca8f5ed: am 40375099: Reconcile with ics-mr1-release 
* commit '8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9':
 2011-12-12 15:44:11 -08:00
The Android Open Source Project
6c3b637d44 am b34027bb: am f14dc291: Merge from ics-mr1 
* commit 'b34027bb2fc3394d054986d7bbbcf54261436c11':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:44:09 -08:00
The Android Open Source Project
8ca8f5ed12 am 40375099: Reconcile with ics-mr1-release 
* commit '40375099d10139b6c96c1db8b8295874d60c712e':
 2011-12-12 15:39:19 -08:00
The Android Open Source Project
b34027bb2f am f14dc291: Merge from ics-mr1 
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:39:17 -08:00
Irfan Sheriff
5ceeaf7d21 am afb847a4: Merge "Clean up synchronization" 
* commit 'afb847a4692a6e5cded8c7a330d00b70b794896a':
  Clean up synchronization
 2011-12-12 15:37:53 -08:00
Irfan Sheriff
afb847a469 Merge "Clean up synchronization" 2011-12-12 15:35:25 -08:00
Justin Ho
6ee5c04df3 am ee8005e6: am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'ee8005e6ecbb95dad98cf1badbeb2b66c794b790':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:34:51 -08:00
Jeff Tinker
18e76fd74e am a6e54945: am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'a6e549455a17970b5e7b75686d6cc1c7169d59c3':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:34:49 -08:00
Joe Fernandez
15b47788d5 am 3f6efeaa: am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit '3f6efeaad72bac766351b91d7c47639ca6d08330':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-12 15:34:47 -08:00
Gilles Debunne
61eda07157 am 0288c6c5: am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit '0288c6c562bcef5ebeb100d32c1f4083c798573d':
  Blinking cursor in Talk
 2011-12-12 15:34:45 -08:00
The Android Open Source Project
291e94a5db am ac9860bb: am 175d5d76: Reconcile with ics-mr1-release 
* commit 'ac9860bb738e6536eb4d89d6a4811e67901c6181':
 2011-12-12 15:34:43 -08:00
James Dong
e21fb8ce87 am b7e02819: am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit 'b7e0281900db002e9aed8dff0e2fbcd8b22bf91d':
  Fixed the false drm recognition.
 2011-12-12 15:34:41 -08:00
Justin Ho
ee8005e6ec am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:30:36 -08:00
Gilles Debunne
f625582963 am 7cb77c1a: resolved conflicts for merge of 1742f20c to master 
* commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1':
  Performance improvements for long text edition.
 2011-12-12 15:30:25 -08:00
Jeff Tinker
a6e549455a am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:30:16 -08:00
Joe Fernandez
3f6efeaad7 am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-12 15:30:14 -08:00
Gilles Debunne
0288c6c562 am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit 'f107abec56811dea1ae81c6abc78a68e433c1080':
  Blinking cursor in Talk
 2011-12-12 15:30:10 -08:00
The Android Open Source Project
ac9860bb73 am 175d5d76: Reconcile with ics-mr1-release 
* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':
 2011-12-12 15:29:56 -08:00
James Dong
b7e0281900 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.
 2011-12-12 15:29:46 -08:00
Alex Sakhartchouk
f3ebd42a48 Merge "Refactored blur pass code out and added comments." into graphics-dev 2011-12-12 15:22:24 -08:00
Gilles Debunne
7cb77c1a0d resolved conflicts for merge of 1742f20c to master 
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
 2011-12-12 15:16:42 -08:00
Irfan Sheriff
e744cfff7c Clean up synchronization 
- Add delayed disk write in WifiConfigStore
- Remove synchronization and keep all access to config store
throught the state machine thread

Change-Id: I53768a17895e48da7b99542ac95c6c2fddbcb021
 2011-12-12 15:00:02 -08:00
Alex Sakhartchouk
006ecdcf16 Refactored blur pass code out and added comments. 
Change-Id: I99b0480a23c0b604d02db7d819182c35dd53e693
 2011-12-12 14:52:25 -08:00
Robert Greenwalt
5523630012 am cc579b89: Merge "Use the carrier-given dns addrs for tethering." 
* commit 'cc579b89fc03f404bf42a385dceaebf5060dd327':
  Use the carrier-given dns addrs for tethering.
 2011-12-12 14:04:30 -08:00
Robert Greenwalt
cc579b89fc Merge "Use the carrier-given dns addrs for tethering." 2011-12-12 14:02:02 -08:00
Gilles Debunne
a1c7b1da44 am 481c0a26: am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit '481c0a260420a921cdca55130d8d9685d17cf527':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-12 13:38:24 -08:00
Gilles Debunne
9324534317 am e495cc3f: am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit 'e495cc3fd9dbf99fcba4f5a65032c6a5c105eeac':
  Re-use SpanSets in TextLine
 2011-12-12 13:38:22 -08:00
Joe Malin
8bfb48662e am c789b600: am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit 'c789b60076aa8ff4b2824ced6c998d667f6945c1':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-12 13:38:20 -08:00
Chia-chi Yeh
49aa47146b am 2339fe3f: am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit '2339fe3f8f89d6254ce05a1b4e9587f0257e8316':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-12 13:38:18 -08:00
Irfan Sheriff
0540731341 am d9dc7fe6: am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit 'd9dc7fe61e0daaab6c19189904082436b34747a1':
  Fix wifi bring up at boot up
 2011-12-12 13:38:03 -08:00
Jake Hamby
e6618e7054 am 36b8c2e6: am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '36b8c2e6823531e3f7f5167586c6371241be9585':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 13:38:01 -08:00
Romain Guy
36ee0c9fcb am 6752d0ab: Mark color uniform fetched after fetching it 
* commit '6752d0ab029a185a42e34e7a933b669e6ed19e89':
  Mark color uniform fetched after fetching it
 2011-12-12 13:37:45 -08:00
Romain Guy
8df4905c6b am 11326aa1: Merge "Code cleanup" 
* commit '11326aa1b9482fefa0c0bdcb7e48cfeae6f9e33d':
  Code cleanup
 2011-12-12 13:37:42 -08:00
Romain Guy
915ff1a38f am ee698a01: Merge "Free up resources by deleting shaders early on" 
* commit 'ee698a01bdc9ea7aa2b1cd729109b194a130f9f5':
  Free up resources by deleting shaders early on
 2011-12-12 13:37:39 -08:00
Gilles Debunne
481c0a2604 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-12 13:15:53 -08:00
Gilles Debunne
e495cc3fd9 am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine
 2011-12-12 13:15:46 -08:00
Joe Malin
c789b60076 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-12 13:15:36 -08:00
Chia-chi Yeh
2339fe3f8f am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-12 13:15:34 -08:00
Irfan Sheriff
d9dc7fe61e am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
  Fix wifi bring up at boot up
 2011-12-12 12:35:12 -08:00
Jake Hamby
36b8c2e682 am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 12:35:09 -08:00
Romain Guy
6752d0ab02 Mark color uniform fetched after fetching it 
Change-Id: I10e8027018608070a536eb8b51c7a4272e37006c
 2011-12-12 12:15:17 -08:00
Romain Guy
11326aa1b9 Merge "Code cleanup" 2011-12-12 11:44:43 -08:00
Romain Guy
ee698a01bd Merge "Free up resources by deleting shaders early on" 2011-12-12 11:44:32 -08:00
Amith Yamasani
79727e2f11 am 549d5f88: Merge "Show the current stream\'s volume in the volume panel." 
* commit '549d5f88bf96f93de5d10f094bda4a62ac5ebe3a':
  Show the current stream's volume in the volume panel.
 2011-12-12 09:57:42 -08:00
Amith Yamasani
549d5f88bf Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Andreas Huber
ea53e965bf am 2fc93533: Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 
* commit '2fc93533d2689d510c93931bc02ad602fa0e46f2':
  Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler
 2011-12-12 08:33:48 -08:00
Andreas Huber
2fc93533d2 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
The Android Open Source Project
40375099d1 Reconcile with ics-mr1-release 
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
 2011-12-12 07:59:17 -08:00
The Android Open Source Project
f14dc29104 Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
Ben Murdoch
7a6f31d164 am 2ff8cc24: Merge "Clear the WebView picture when a new load starts." 
* commit '2ff8cc2438866f791d8fe888573b5fba103e2cd0':
  Clear the WebView picture when a new load starts.
 2011-12-12 03:24:34 -08:00