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

14637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
34cc65ebb4 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Jean-Baptiste Queru
57c87d26a8 Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
Jean-Baptiste Queru
e02daf9c05 Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Jean-Baptiste Queru
dc932feef0 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Scott Main
fe2871079b am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs 
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into froyo-plus-aosp

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
 2010-06-28 15:31:11 -07:00
Bruce Beare
a1a79197c0 Fix missing NL 
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
 2010-06-25 09:08:12 -07:00
Scott Main
68a41d7f56 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo 
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
 2010-06-24 18:14:06 -07:00
Scott Main
29d8e66ce0 Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Dianne Hackborn
ab32c11fd2 am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
 2010-06-24 16:02:03 -07:00
Dianne Hackborn
2f90b21533 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Nick Pelly
b7687fd9a6 am d19c397b: Merge "Do not log AT command traffic by default." into froyo 
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
 2010-06-24 11:55:56 -07:00
Nick Pelly
7ed4deb035 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
Scott Main
62415f95f0 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 10:08:45 -07:00
Scott Main
0d168d31d4 Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Dirk Dougherty
b38d6045c8 am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 
Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.
 2010-06-22 11:24:01 -07:00
Dirk Dougherty
0f63401fb8 Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 2010-06-22 11:13:48 -07:00
Kenny Root
f50f465b02 am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:16:25 -07:00
Kenny Root
9c4ff3a239 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:15:29 -07:00
The Android Open Source Project
5292755e6e merge from open-source master 
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
 2010-06-18 12:46:16 -07:00
The Android Open Source Project
16df15b777 merge from open-source master 
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
 2010-06-18 12:44:20 -07:00
The Android Open Source Project
de3f19a220 merge from open-source master 
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
 2010-06-18 12:40:42 -07:00
The Android Open Source Project
2045f4b3c5 merge from open-source master 
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
 2010-06-18 11:36:35 -07:00
Dianne Hackborn
5b3e5cf106 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into froyo-plus-aosp

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 16:58:15 -07:00
Scott Main
d64fcd75c2 am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into froyo-plus-aosp

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 12:23:58 -07:00
James Dong
73d1a539e7 am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 12:23:48 -07:00
Dave Sparks
25b5fc3cdf am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro 
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
 2010-06-17 12:23:44 -07:00
Scott Main
fa56cb4e72 am 821ca518: docs: edits to resources doc 
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into froyo-plus-aosp

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
 2010-06-17 12:23:35 -07:00
Scott Main
3eee82d740 am bccedb03: docs: update dashboard again 
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into froyo-plus-aosp

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
 2010-06-17 12:23:18 -07:00
Dan Morrill
02c719bc78 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. 
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
 2010-06-17 12:23:03 -07:00
James Dong
748ad2b542 Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 2010-06-16 16:10:52 -07:00
Dave Sparks
e9a36f1e11 Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo 2010-06-16 14:11:40 -07:00
Scott Main
2de01b8ef6 am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
 2010-06-15 19:43:19 -07:00
Scott Main
b7310b28e2 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Ying Wang
bcc354a08b am 6567adf8: Move android-common to framework/ex 
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp

* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
  Move android-common to framework/ex
 2010-06-15 15:32:36 -07:00
Ying Wang
98294e50d7 Move android-common to framework/ex 
This is one necessary step by unbundling.

Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
 2010-06-15 15:28:42 -07:00
Jean-Baptiste Queru
5105cb3bcd Merge "Fixing counting the number of days in call log screen." 2010-06-15 15:11:34 -07:00
Joe Onorato
b03eaf3f65 am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo 
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp

* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
  Use the droidcore goal with dist-for-goals.
 2010-06-15 14:24:58 -07:00
Joe Onorato
9161e1ce2a am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo 
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
 2010-06-15 14:24:51 -07:00
Joe Onorato
d103af4f4e Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6 Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo 2010-06-15 13:58:33 -07:00
Romain Guy
1b2b42e8fe Merge "fillWindow's start position must be smaller than getCount value" 2010-06-15 11:47:02 -07:00
Romain Guy
6ed842e88e Merge "Change in media scanner to set correct date" 2010-06-15 11:46:42 -07:00
The Android Open Source Project
70dcdfd240 merge from open-source master 
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
 2010-06-15 11:44:09 -07:00
The Android Open Source Project
32df01f775 merge from open-source master 
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
 2010-06-15 11:37:17 -07:00
The Android Open Source Project
0acbc14307 merge from open-source master 
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
 2010-06-15 11:34:57 -07:00
Scott Main
14e2e18666 am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp

* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
  docs: add information about known issues in resource matching
 2010-06-15 10:45:55 -07:00
Scott Main
08de33c872 am 322e7e47: Merge "docs: fix markup error" into froyo 
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
 2010-06-15 10:45:50 -07:00
Jean-Baptiste Queru
3f049d6aa6 Merge "Fix that InputDeviceReaderThread that got killed during startup" 2010-06-15 10:40:51 -07:00
Scott Main
10d3c342b0 Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 2010-06-15 10:36:27 -07:00
Scott Main
3dde3706fa Merge "docs: fix markup error" into froyo 2010-06-15 10:36:14 -07:00