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

29955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
4421784895 am ae6bdc23: Merge "Fix issue 2952766." into gingerbread 
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.
 2010-08-30 15:04:48 -07:00
Jean-Baptiste Queru
1d22e122a6 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Eric Laurent
ae6bdc23bd Merge "Fix issue 2952766." into gingerbread 2010-08-30 15:02:06 -07:00
Gloria Wang
9bc4dbb377 Merge "Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'"" 2010-08-30 14:43:11 -07:00
Gloria Wang
45bc5eca2b Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'" 
Change-Id: Id98df7dcdfa4119783fca6cb5478df5b99050738
 2010-08-30 14:29:31 -07:00
Eric Fischer
8c55d4791b Merge "Import revised translations" 2010-08-30 14:20:05 -07:00
Wu-cheng Li
b8f7f42f70 am 6e46e6f7: am 7ec7b997: Remove camera metering mode API. 
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
  Remove camera metering mode API.
 2010-08-30 14:06:16 -07:00
Jean-Baptiste Queru
1ace4163fa resolved conflicts for merge of ff749b9a to master 
Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
 2010-08-30 14:00:27 -07:00
Wu-cheng Li
6e46e6f748 am 7ec7b997: Remove camera metering mode API. 
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp

* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
  Remove camera metering mode API.
 2010-08-30 13:48:07 -07:00
Jean-Baptiste Queru
9ef658ddda am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text" 
Merge commit '9773cd73b627c8521257c005881554d183d19a63'

* commit '9773cd73b627c8521257c005881554d183d19a63':
  Support surrogate pairs when layouting text
 2010-08-30 13:47:37 -07:00
Joe Onorato
c1e02b9f1f Merge "Add another pass of the docs that nothing depends on that tries to parse some of the docs but without generating all of them." 2010-08-30 13:34:55 -07:00
Wu-cheng Li
7ec7b9970c Remove camera metering mode API. 
Metering mode is not supported yet.

Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
 2010-08-30 13:33:53 -07:00
Joe Onorato
4314e2e674 Add another pass of the docs that nothing depends on that tries to parse some of the docs but 
without generating all of them.

This should cut down on the number of sdk breakages.

Change-Id: I947cc346bc525b05cc064c102171c4004303d7ed
 2010-08-30 13:33:51 -07:00
Eric Fischer
aa2aaf344f Import revised translations 
Change-Id: I51d0b3da80886dbcbd0774af896a8727c9a6f84c
 2010-08-30 13:31:13 -07:00
Andreas Huber
2527da00e2 am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'

* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
 2010-08-30 13:30:35 -07:00
Eric Laurent
9d01dcbdf2 am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread 
Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'

* commit '5762dc19836e332d3ac1906e5698088a128b362d':
  LVM release 1.07 delivery.
 2010-08-30 13:30:14 -07:00
Eric Rowe
8e1bc8c508 am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'

* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 13:30:10 -07:00
Andreas Huber
3678668997 am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants. 
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.
 2010-08-30 13:30:05 -07:00
Eric Fischer
5366f26cdb am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'

* commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 13:29:57 -07:00
Andreas Huber
631025eec0 am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 13:29:51 -07:00
Imre Sunyi
ec959a7e38 am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 13:28:16 -07:00
Jean-Baptiste Queru
ff749b9a0d am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data." 
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
 2010-08-30 13:20:57 -07:00
Jean-Baptiste Queru
9773cd73b6 am f470ed86: Merge "Support surrogate pairs when layouting text" 
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
 2010-08-30 13:20:41 -07:00
Andreas Huber
9aa05ec2cd am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
 2010-08-30 13:06:55 -07:00
Andreas Huber
681c5ff208 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Jean-Baptiste Queru
55a2df8c77 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Romain Guy
7dff1a7214 Make profiling easier. 
Change-Id: I3d4a0a0ead72569a8950bc986dfe584b186e0d65
 2010-08-30 12:49:07 -07:00
Andreas Huber
30cfa20dfc Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore. 
Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3
related-to-bug: 2370115
 2010-08-30 12:46:12 -07:00
Eric Laurent
5762dc1983 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread 
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
 2010-08-30 12:33:56 -07:00
Eric Rowe
6151a9ef23 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
 2010-08-30 12:33:52 -07:00
Andreas Huber
7ed9104c3a am f6639c46: Finetune some rtsp timeout constants. 
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
 2010-08-30 12:33:25 -07:00
Eric Fischer
a7dae24ccd am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp

* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
  Import revised translations.  DO NOT MERGE
 2010-08-30 12:33:19 -07:00
Andreas Huber
6df6d60681 am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
 2010-08-30 12:33:08 -07:00
Daisuke Miyakawa
da2ccb49b1 Merge "Fix NPE when Spinner is reused." 2010-08-30 12:22:47 -07:00
Daisuke Miyakawa
3f10b1c8f8 Fix NPE when Spinner is reused. 
Bug: 2958228
Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
 2010-08-30 11:52:35 -07:00
Eric Laurent
858bb4f66e Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00
Eric Rowe
f72b0e4472 Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Patrick Dubroy
6dabe240ed Add an Intent category for apps that provide an app market. 2010-08-30 11:29:10 -07:00
Banavathu, Srinivas Naik
0e67c8926b Telephony: Control operator selection using EF_CSP data. 
As per CPHS4_2.WW6, CPHS B.4.7.1, the most significant bit of
Value Added Services Group(0xC0) info, controls operator selection menu.
   -If this bit is set, display operator selection menu to user.
   -If this bit is not set do not display operator selection menu to user,
	 set Network Selection Mode to Automatic.

Change-Id: Icca4898abced0b0beb94c3434448a26eae72008b
 2010-08-30 11:05:38 -07:00
Alex Sakhartchouk
9846bc6a9b Merge "Fixing renderscript uniform binding bugs. Working on custom shaders." 2010-08-30 10:39:46 -07:00
Andreas Huber
f6639c46e8 Finetune some rtsp timeout constants. 
Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
 2010-08-30 10:35:56 -07:00
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location. 
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 13:35:03 -04:00
Imre Sunyi
1429f465f4 am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead 
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp

* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
  Shutdown when capacity is 0% and no charging or when battery is dead
 2010-08-30 10:33:35 -07:00
Eric Fischer
01ee34d707 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:28:58 -07:00
Andreas Huber
df992ac9cc Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Mike Lockwood
daeeddc5ed MTP: Fix build break due to misuse of "git add -i" command 
Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-30 12:26:08 -04:00
Jean-Baptiste Queru
f470ed8630 Merge "Support surrogate pairs when layouting text" 2010-08-30 09:15:42 -07:00
Mike Lockwood
af2ba835f5 Merge "MTP: Add try/finally handling to finalize overrides" 2010-08-30 08:59:21 -07:00
Derek Sollenberger
3a23a3f367 am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:34:23 -07:00
Derek Sollenberger
a3faa923a0 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread 
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
 2010-08-30 08:06:36 -07:00