ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,635 Commits 2 Branches 0 Tags 54 MiB
e02daf9c05
Commit Graph

14635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
e475488b11 merge from open-source master 
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
 2010-06-07 16:32:53 -07:00
Jean-Baptiste Queru
a0abbe38b9 Merge "Canvas.drawVertices: correct color range-check" 2010-06-07 14:51:42 -07:00
Christopher Tate
076c8394fa am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
 2010-06-04 18:07:07 -07:00
Christopher Tate
7188d6887e Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-04 18:06:07 -07:00
Dianne Hackborn
f896be96c9 am 5474902f: Merge "xhdpi" into froyo 
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
 2010-06-04 16:33:48 -07:00
Dianne Hackborn
28b9f6e900 Merge "xhdpi" into froyo 2010-06-04 16:32:01 -07:00
Robert Greenwalt
227232f703 am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-04 15:57:21 -07:00
Robert Greenwalt
0f3ca0faea Merge "Make the DUN apn data secure." into froyo 2010-06-04 15:55:09 -07:00
Jeff Hamilton
e0f5def3fd am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp

* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
  Don't crash when low storage is encountered pre-boot completion.
 2010-06-04 13:50:31 -07:00
The Android Open Source Project
dc544d2168 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Andreas Huber
dc9c0cb435 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
da26806e79 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
Romain Guy
ec39747a76 Merge "Add better error handling for savePicture and restorePicture" 2010-06-03 14:26:21 -07:00
Dirk Dougherty
daca1ada02 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
c253940208 Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 12:57:06 -07:00
James Dong
1ce3ee8a00 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
c1cf2705d5 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:26:09 -07:00
The Android Open Source Project
1531d2f979 merge from open-source master 
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
 2010-06-03 09:03:58 -07:00
Scott Main
a689e8ed41 am 6a297118: Merge "docs: a couple doc bug fixes" into froyo 
Merge commit '6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp

* commit '6a297118724f31b1063b74f52295d459ec4f58dc':
  docs: a couple doc bug fixes
 2010-06-02 13:44:44 -07:00
Scott Main
e66d578d71 Merge "docs: a couple doc bug fixes" into froyo 2010-06-02 13:43:18 -07:00
The Android Open Source Project
44cb1fe3e4 merge from open-source master 
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
 2010-06-02 08:54:47 -07:00
The Android Open Source Project
c99c7120c3 merge from open-source master 
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
 2010-06-02 08:41:59 -07:00
Mathias Palmqvist
a409e195fe Use stride for source and target buffers when copybit is enabled. 
Change-Id: Ie651013b3522f8e004685d74190da86433086307
 2010-06-02 16:03:04 +02:00
Kenny Root
792e065b20 Merge "Improved error-handling in Rfc822Tokenizer" 2010-06-01 22:56:39 -07:00
Dirk Dougherty
7c7eadeb4f am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp

* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
  Doc change: rename slide decks for sorting by year then quarter.
 2010-06-01 15:45:24 -07:00
Dirk Dougherty
4005afd071 Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 2010-06-01 15:44:02 -07:00
Dan Egnor
d691a841f6 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo 
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
 2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b Merge "Comment-only change to add documentation for FileObserver" into froyo 2010-06-01 14:09:20 -07:00
Dirk Dougherty
88e4f7fb39 am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo 
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp

* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
  Doc change: updated dashboards stats.
 2010-06-01 11:07:56 -07:00
Dirk Dougherty
2a053dc08d Merge "Doc change: updated dashboards stats." into froyo 2010-06-01 11:04:20 -07:00
Christopher Tate
1647a676f3 am 6ee412d5: Also dump system process threads halfway through the watchdog interval 
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp

* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
  Also dump system process threads halfway through the watchdog interval
 2010-05-28 12:50:05 -07:00
Kenny Root
085a308606 am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp

* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
  Fix typo in EastAsianWidth javadoc
 2010-05-27 12:35:25 -07:00
Dirk Dougherty
2c03020da7 am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp

* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
 2010-05-27 12:35:18 -07:00
Kenny Root
2baa0fbad3 Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:04:34 -07:00
Dirk Dougherty
f007f06d61 Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 2010-05-27 11:46:26 -07:00
Jeff Hamilton
9994e682f1 am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo 
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp

* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
  Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
 2010-05-27 09:40:23 -07:00
Jeff Hamilton
5b4069e958 Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo 2010-05-27 09:39:19 -07:00
Irfan Sheriff
4a977bd462 am b3f3caef: Merge "Fix null pointer exception" into froyo 
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp

* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
  Fix null pointer exception
 2010-05-26 21:34:52 -07:00
Irfan Sheriff
cde682745c Merge "Fix null pointer exception" into froyo 2010-05-26 21:32:29 -07:00
Dirk Dougherty
58fccc44cd am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp

* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
  Doc change: Suggest min keysize of 2048 for keys.
 2010-05-26 18:33:05 -07:00
Dirk Dougherty
6667c7976f Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo 2010-05-26 18:31:38 -07:00
Dirk Dougherty
e69271769a am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp

* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
  Doc change: fix adt download page, misc doc fixes.
 2010-05-26 16:51:12 -07:00
Dirk Dougherty
60f35bb2fe Merge "Doc change: fix adt download page, misc doc fixes." into froyo 2010-05-26 16:49:46 -07:00
Irfan Sheriff
df360ef5dd am 9ecca85f: Merge "Fix escaping of characters" into froyo 
Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp

* commit '9ecca85f0613032590c6840cae48b54f3d626181':
  Fix escaping of characters
 2010-05-26 13:04:11 -07:00
Irfan Sheriff
d50f8399fa Merge "Fix escaping of characters" into froyo 2010-05-26 13:02:06 -07:00
Yu Shan Emily Lau
605cb756f8 am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
d5fa4a9f4f Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:40:51 -07:00
Robert Greenwalt
1a5fe61ee1 am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:13:22 -07:00
Adam Powell
213f391635 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
 2010-05-24 16:23:53 -07:00
Dirk Dougherty
534663ed7b am c7c7afd7: Doc change: Fix incorrect adt version reference etc. 
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp

* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
  Doc change: Fix incorrect adt version reference etc.
 2010-05-24 09:56:47 -07:00