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

24777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
aae74ad614 Creating the jni and java layer to integrate a3d 
Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
 2010-06-04 10:06:50 -07:00
Brad Fitzpatrick
e407a608b0 resolved conflicts for merge of 7d6362de to master 
Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6
 2010-06-03 17:15:48 -07:00
Vasu Nori
df0089e1d2 Merge "set some members to final, set database errorhandler to default if null." 2010-06-03 16:46:31 -07:00
Brad Fitzpatrick
7d6362de06 am 266b74e8: Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:09:35 -07:00
Brad Fitzpatrick
266b74e875 Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:07:51 -07:00
Vasu Nori
2134369e80 set some members to final, set database errorhandler to default if null. 
Change-Id: I1c2d8181e7fe60c869178a43dcc00519dd0072c7
 2010-06-03 16:01:39 -07:00
Andreas Huber
8fd2913a7d am 17dabbdf: am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:35:35 -07:00
Andreas Huber
17dabbdf86 am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:33:35 -07:00
Andreas Huber
b8c7548df6 am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 
Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken

* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
 2010-06-03 15:31:56 -07:00
Andreas Huber
e896d41699 am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp

* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
 2010-06-03 15:30:03 -07:00
Andreas Huber
2e3761ba43 Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:28:13 -07:00
Vasu Nori
97efcf11d8 Merge "fix docs errors" 2010-06-03 14:59:51 -07:00
Vasu Nori
03acd51bae fix docs errors 
Change-Id: I775dc3e665a8ce32ed6c95f3240280ddef984bb6
 2010-06-03 14:44:39 -07:00
Andreas Huber
3c460f3da0 Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle. 
Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
 2010-06-03 14:43:57 -07:00
Jesse Wilson
f6aa6185a4 Merge "Preloaded class list problems shall no longer break the build." 2010-06-03 14:24:56 -07:00
Dirk Dougherty
7c0761052e am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:04:01 -07:00
Dirk Dougherty
b7371455e8 am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:02:28 -07:00
Dirk Dougherty
c458d0e307 am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken

* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
  Doc change: Adjust security sandbox description.
 2010-06-03 13:00:31 -07:00
Dirk Dougherty
b85a1679a4 am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp

* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
  Doc change: Adjust security sandbox description.
 2010-06-03 12:58:35 -07:00
Dirk Dougherty
85a1c57830 Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 12:57:06 -07:00
Brad Fitzpatrick
cfda9f3a47 Sprinkle new BlockGuard around SQLiteDatabase. 
SQLite is JNI to native code and doesn't go via IFileSystem, so it
needs custom sprinkling, at least for now.

Change-Id: Ic7fded1b64a4f483dfc17b3a7b136c803df1e111
 2010-06-03 12:52:54 -07:00
Vasu Nori
512596d425 Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler" 2010-06-03 12:42:32 -07:00
Romain Guy
f8b0f11a94 Merge "Fix memory leak in LocalActivityManager. Also properly removes embedded activities. Bug #2738247" 2010-06-03 12:39:53 -07:00
Vasu Nori
74f170f946 new API in Context. on openDatabase, new param DatabaseErrorHandler 
add new method openOrCreateDatabase in Context.java to allow
callers specify a DatabaseErrorHandler object to be used when
database corruption occurs.
add new constructor in SQLiteOpenHelper to accept DatabaseErrorHandler
as an additional param to be used when SQLiteDatabase instance is
created.

Change-Id: I912a0202a74510f9ca0206dd8101c4abab9102ae
 2010-06-03 12:38:11 -07:00
Jesse Wilson
e2417541b4 Preloaded class list problems shall no longer break the build. 
This list is mechanically generated and its a waste of engineering
effort to manually edit this list when a class is deleted or renamed.

Change-Id: Ia8b6ae004678df2c5e2c268742c3a2d7c6a10db3
 2010-06-03 12:33:26 -07:00
Elliott Hughes
26ae7875ad Remove dead classes from the preload list. 
Change-Id: I90799fe258ea23db764193fc5fab1a25c13b5563
 2010-06-03 12:10:28 -07:00
Elliott Hughes
55bd466d78 Fix build by adding Java 6 API changes that were not in the earlier merge. 
Change-Id: I10425b6932fc69e206da5a2cf9e120c007eec9cd
 2010-06-03 12:08:56 -07:00
Vasu Nori
ac7ae9cc91 Merge "add API to Cursor to get column value type" 2010-06-03 11:46:03 -07:00
James Dong
e4c8aa60e3 am a3d1c3cd: am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:34:36 -07:00
James Dong
a3d1c3cd96 am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:32:29 -07:00
James Dong
57ad07039a am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken

* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
 2010-06-03 11:30:03 -07:00
James Dong
c40209ac60 am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
 2010-06-03 11:27:19 -07:00
James Dong
28a92b2e76 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:26:09 -07:00
Vasu Nori
76bb78ebcc Merge "cleanup some small but ugly things. all minor things." 2010-06-03 11:07:20 -07:00
Vasu Nori
ccd954480c cleanup some small but ugly things. all minor things. 
Change-Id: I6a3ea9ad563ea895e7f3c37647bdadd2cfa8fc29
 2010-06-03 11:06:47 -07:00
Romain Guy
d315ee93c6 Fix memory leak in LocalActivityManager. Also properly removes embedded activities. 
Bug #2738247

Change-Id: Ib75be22fde5f1408250947566c69174c6f248c98
 2010-06-03 11:03:18 -07:00
Romain Guy
f7353da8a0 Merge "Do not invoke onProgressUpdate if the task is canceled. Bug #2734382" 2010-06-03 10:58:05 -07:00
Romain Guy
4aaf8ec9df Do not invoke onProgressUpdate if the task is canceled. 
Bug #2734382

Change-Id: I8d507ae72af2f6dfe66598fb9090872520111a6b
 2010-06-03 10:56:41 -07:00
James Dong
9d96354d70 Fix a Javadoc to clarify when setAudioStreamType() should be called. 
bug - 2737926

Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
 2010-06-03 10:37:28 -07:00
Derek Sollenberger
627eca9b62 Merge "Update EmbeddedZoomControl to use new ZoomManager methods." 2010-06-03 10:35:04 -07:00
Derek Sollenberger
5c1c29a1e9 Merge "Refactor zoom logic from WebView to ZoomManager." 2010-06-03 10:07:05 -07:00
Kenny Root
453bcedeaa am 5095232d: am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:37:14 -07:00
Kenny Root
5095232d25 am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:36:00 -07:00
Kenny Root
15fe2cb73b Add error checking for translatable strings 
Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.

Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
 2010-06-03 09:33:43 -07:00
The Android Open Source Project
4f2cf8af55 am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:12:40 -07:00
The Android Open Source Project
913dbc5061 am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:10:54 -07:00
The Android Open Source Project
a9f06fef8e am ee7e6a78: merge from open-source master 
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken

* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
  Improved error-handling in Rfc822Tokenizer
 2010-06-03 09:09:07 -07:00
The Android Open Source Project
ee7e6a78e2 merge from open-source master 
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
 2010-06-03 09:03:58 -07:00
Leon Clarke
790e71d814 Merge "Add indexeddb files to the skip list" 2010-06-03 07:05:47 -07:00
Leon Clarke
970effc07c Add indexeddb files to the skip list 2010-06-03 15:00:11 +01:00