ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,917 Commits 2 Branches 0 Tags 54 MiB
376f0c3ee6
Commit Graph

13917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
376f0c3ee6 am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp

* commit 'eb12e45f7a92fd424988451256c82605d086245d':
  Refactor connection/redirection code, support redirects on reconnection.
 2010-04-08 12:45:59 -07:00
Robert Greenwalt
53b96a3c8e am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
 2010-04-08 12:45:51 -07:00
Andreas Huber
d85bfb3a14 Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Dianne Hackborn
6286f57ea6 am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
 2010-04-08 11:39:03 -07:00
The Android Open Source Project
d1f9f3e832 merge from open-source master 
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
 2010-04-08 11:35:37 -07:00
Dianne Hackborn
be4143d514 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
529973acc2 merge from open-source master 
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
 2010-04-08 11:27:55 -07:00
Scott Main
c01e716961 am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp

* commit '4981863de52941f053bf002ae2f9c8f705534599':
  docs: revisions to the installLocation documentation
 2010-04-08 11:25:36 -07:00
Scott Main
436aa0ff9c Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:22:42 -07:00
Jaikumar Ganesh
8d2ccb8b2d am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp

* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
  Don't allow connection to profiles in TURNING_OFF state.
 2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
6b4e57141f Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Andrei Popescu
d18e7e3d54 am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp

* commit '3fe36fe589809b732db12054428166adb069f53b':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
 2010-04-08 09:10:09 -07:00
Andrei Popescu
95ecb699b0 Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:07:32 -07:00
Andreas Huber
4a42aa9d7c 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
fd1a82638c 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
Daniel Sandler
089057817f 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
221ff33f3a 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
c75afb3e8a Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
81ce80eb67 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Dianne Hackborn
356f09beba 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
Wu-cheng Li
ba00ad094e 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
33409ed31f 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
de14d8f178 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
Dianne Hackborn
cad1d540bc 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
ec874971f5 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
Grace Kloba
3d339a93b9 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -07:00
Dianne Hackborn
8b19a84593 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
aba899bb7d 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
7aed49313c 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
0f606ea702 Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -07:00
Grace Kloba
6b76ae1c2d 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
Grace Kloba
2768afff40 Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:18:17 -07:00
John Wang
8551b6600d am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp

* commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
  Add emergencyOnly indicator in ServiceState.
 2010-04-07 17:54:27 -07:00
John Wang
0a8cf0b36b Merge "Add emergencyOnly indicator in ServiceState." into froyo 2010-04-07 17:51:41 -07:00
San Mehat
232106be56 am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo 
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp

* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
  NetworkManagementService: Remove 'maxkbs' parameter from throttle API
 2010-04-07 16:32:29 -07:00
Suchi Amalapurapu
e8c087e789 am 4b18ced6: Merge "Fix 2578016." into froyo 
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp

* commit '4b18ced6b5409bb9dd4013c06b9562b76a062939':
  Fix 2578016.
 2010-04-07 16:32:26 -07:00
San Mehat
25d9df20a2 Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo 2010-04-07 15:32:44 -07:00
Suchi Amalapurapu
60e514bfb4 Merge "Fix 2578016." into froyo 2010-04-07 15:25:51 -07:00
Christopher Tate
079edce86d am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo 
Merge commit '98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp

* commit '98e26575373461dc16c749d1f756403e46a909d4':
  Add Backup/Restore sample to the SDK docs
 2010-04-07 14:22:23 -07:00
Christopher Tate
727b5ff4e6 Merge "Add Backup/Restore sample to the SDK docs" into froyo 2010-04-07 14:19:44 -07:00
Marco Nelissen
eabd04795a am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo 
Merge commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp

* commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda':
  Don't check whether a specific named activity supports mp3 playback,
 2010-04-07 13:33:11 -07:00
Marco Nelissen
138da33e45 Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo 2010-04-07 13:28:51 -07:00
Ray Chen
34e03df4e9 am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp

* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
 2010-04-07 12:09:42 -07:00
Ray Chen
5560ff353d Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Dianne Hackborn
651e63c4f7 am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp

* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
 2010-04-07 11:52:21 -07:00
Dianne Hackborn
3d47856532 am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest 
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp

* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
 2010-04-07 11:52:17 -07:00
Dianne Hackborn
e098fb12b8 Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 11:49:37 -07:00
Andreas Huber
ddb4ab191d am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo 
Merge commit '567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp

* commit '567b57b68884c68e3c95834589e5f7921f380a45':
  Report the requested seek time while seek is in progress.
 2010-04-07 11:02:11 -07:00
Andreas Huber
5bf9232cf2 Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 10:58:05 -07:00