Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,652 Commits 3 Branches 0 Tags
604c0371cfe199f766aa3e92d45a8bbac5a2a71d
Commit Graph

21652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
604c0371cf am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range he 2010-04-08 08:43:30 -07:00
Andreas Huber
c63c6e97c4 am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and bett 
Merge commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken

* commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6':
  Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
 2010-04-08 08:35:53 -07:00
Andreas Huber
d06c435c3f am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand 
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp

* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
  Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
 2010-04-08 08:31:20 -07:00
Andreas Huber
c6c8a1e96f Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo 2010-04-08 08:27:20 -07:00
Andreas Huber
a51250bdc7 Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection. 
Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
 2010-04-08 07:51:20 -07:00
Daniel Sandler
aed9d41b8c am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:35:40 -07:00
Daniel Sandler
59ff911b3a am 8c66936a: am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo 2010-04-08 06:35:34 -07:00
Daniel Sandler
715896be3d am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 
Merge commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken

* commit '6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
  Transparent alarm icons for lockscreen.
 2010-04-08 06:33:26 -07:00
Daniel Sandler
8c66936a8d am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo 
Merge commit '070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken

* commit '070237771e89bbf027ed85302df7a91fae0fa5c2':
  Add emergency call button to PUK'd lockscreen.
 2010-04-08 06:33:23 -07:00
Daniel Sandler
6fec76a081 am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 
Merge commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp

* commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
  Transparent alarm icons for lockscreen.
 2010-04-08 06:10:12 -07:00
Daniel Sandler
070237771e am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo 
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp

* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
  Add emergency call button to PUK'd lockscreen.
 2010-04-08 06:10:09 -07:00
Daniel Sandler
8d318958a3 Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
9f71025b37 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Dianne Hackborn
48357eeee1 am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 2010-04-07 22:44:56 -07:00
Dianne Hackborn
b921b37b1c am a327dbdd: am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken

* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
  Fix issue #2541849: System crash when an app with active notifications...
 2010-04-07 22:42:46 -07:00
Dianne Hackborn
a327dbddcc am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp

* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
  Fix issue #2541849: System crash when an app with active notifications...
 2010-04-07 22:39:18 -07:00
Dianne Hackborn
ecb0e63787 Fix issue #2541849: System crash when an app with active notifications... 
...in status bar is installed on sdcard and device is powered down.

Don't do the GC until everyone has had a chance to take care of external
storage going away.

This is more correct, but doesn't completely fix the problem that
appears when shutting down.

Change-Id: I24b19337ba6262cfd8d010645dbf67e76ea03058
 2010-04-07 22:19:55 -07:00
Wu-cheng Li
1479d20234 am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 2010-04-07 22:06:37 -07:00
Wu-cheng Li
249c902ca6 am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken

* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
  Update API and javadoc according to API review.
 2010-04-07 22:01:54 -07:00
Wu-cheng Li
75a9cbaea4 am 3f4639a6: Update API and javadoc according to API review. 
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp

* commit '3f4639a6611222ae1ae5493de49213250d292139':
  Update API and javadoc according to API review.
 2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
eb606ec9d5 am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:36:43 -07:00
Suchi Amalapurapu
3e543abbc1 am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken

* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
  Fix 2579461
 2010-04-07 21:32:30 -07:00
Wu-cheng Li
3f4639a661 Update API and javadoc according to API review. 
bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
 2010-04-08 12:31:06 +08:00
Suchi Amalapurapu
a599469f90 am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp

* commit 'c2461be6279137f872becf695befeb7ba8770a64':
  Fix 2579461
 2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
c2461be627 Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:24:36 -07:00
Suchi Amalapurapu
40e472521a Fix 2579461 
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
 2010-04-07 20:43:54 -07:00
Dianne Hackborn
f0dc083ddb am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 2010-04-07 19:17:45 -07:00
Grace Kloba
390aca99f4 am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 19:14:53 -07:00
Dianne Hackborn
d49c455cc9 am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken

* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
  Fix issue #2578244: playing audio file downloaded by the browser...
 2010-04-07 19:13:22 -07:00
Dianne Hackborn
822a7e2def am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp

* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
  Fix issue #2578244: playing audio file downloaded by the browser...
 2010-04-07 19:07:54 -07:00
Grace Kloba
962ebd1fcc am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken

* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
  Revert "Use the content width to calculate the zoom overview"
 2010-04-07 19:05:32 -07:00
Dianne Hackborn
ce59fb8b68 Fix issue #2578244: playing audio file downloaded by the browser... 
...shows an image downloaded by the browser

The downloads directory needs to be non-plural for backwards compatibility.

Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
 2010-04-07 19:02:13 -07:00
Grace Kloba
520d684093 am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp

* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
  Revert "Use the content width to calculate the zoom overview"
 2010-04-07 19:00:40 -07:00
Dianne Hackborn
9ed9c0e48b am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 19:00:35 -07:00
Grace Kloba
667543cdb5 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -07:00
Dianne Hackborn
d93df9cac9 am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 
Merge commit 'b37abe3867d582d68918d38f0684783f457543bb' into kraken

* commit 'b37abe3867d582d68918d38f0684783f457543bb':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
 2010-04-07 18:57:33 -07:00
Dianne Hackborn
b37abe3867 am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp

* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
 2010-04-07 18:41:42 -07:00
Dianne Hackborn
2b973a6be7 am 90dd6462: am 48879933: am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:40:15 -07:00
Grace Kloba
188bf8deb4 Revert "Use the content width to calculate the zoom overview" 
This reverts commit 4a4f9886a7.

Fix http://b/issue?id=2577238
 2010-04-07 18:37:32 -07:00
Dianne Hackborn
90dd6462db am 48879933: am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 
Merge commit '4887993381af1068cb0c68b4eca29ed83ebf47bd' into kraken

* commit '4887993381af1068cb0c68b4eca29ed83ebf47bd':
  Fix issue #2528537: android.os.DeadObjectException
 2010-04-07 18:37:12 -07:00
Dianne Hackborn
d3cc496760 Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 18:37:04 -07:00
Dianne Hackborn
4887993381 am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 
Merge commit '390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp

* commit '390022b23b2c53119ff0bde4b14d14728bc48bb2':
  Fix issue #2528537: android.os.DeadObjectException
 2010-04-07 18:33:23 -07:00
Dianne Hackborn
390022b23b Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -07:00
Grace Kloba
d001003870 am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:28:43 -07:00
Grace Kloba
c020ec5723 am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 
Merge commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken

* commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293':
  Cherry-pick https://android-git.corp.google.com/g/#change,38305
 2010-04-07 18:26:38 -07:00
Grace Kloba
edee621f5c am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 
Merge commit 'faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp

* commit 'faa2d970058557fa31d06d168b402d592c368aaf':
  Cherry-pick https://android-git.corp.google.com/g/#change,38305
 2010-04-07 18:23:25 -07:00
Dianne Hackborn
559a787531 Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app 
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.

Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
 2010-04-07 18:19:41 -07:00
Grace Kloba
faa2d97005 Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:18:17 -07:00
John Wang
cdb601489c am 90f2a71e: am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 2010-04-07 18:02:56 -07:00
John Wang
90f2a71e1e am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 
Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken

* commit '7ecf08faa9da7d372dd319aac8b1e5760a116601':
  Add emergencyOnly indicator in ServiceState.
 2010-04-07 17:58:53 -07:00