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

14694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
339b90e023 resolved conflicts for merge of 4e33e9c1 to master 
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
 2010-04-08 13:54:58 -07:00
Robert Greenwalt
71329eee0a am 6646cf7a: am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:53:18 -07:00
Robert Greenwalt
f4b6a4e7f3 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
 2010-04-08 12:49:38 -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
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
dd8f92ca85 am 306e2b50: am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:45:21 -07:00
The Android Open Source Project
cbfcc9ce29 am 5e78c1f4: am c9522c95: am 727cec02: merge from open-source master 2010-04-08 11:45:17 -07:00
Dianne Hackborn
ec402586b6 am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:43:06 -07:00
The Android Open Source Project
f7c37ef1ad am c9522c95: am 727cec02: merge from open-source master 2010-04-08 11:43:03 -07:00
Dianne Hackborn
809a225e3a am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 
Merge commit '2c5c9bb89b539a1a97d093a54669bf2242697410' into kraken

* commit '2c5c9bb89b539a1a97d093a54669bf2242697410':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
 2010-04-08 11:41:38 -07:00
The Android Open Source Project
76209e94ba am 727cec02: merge from open-source master 
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken

* commit '727cec02daa66b5e984aff277185d503fabe5d51':
  Fix reporting of window visibility in WindowManagerService.
 2010-04-08 11:39:51 -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
1ce8693377 am 4a78a4fe: am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:37:37 -07:00
Scott Main
b7e4eecd6a am 5d1b63c5: am bc494d43: am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:37:32 -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
349658c055 am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:33:28 -07:00
Scott Main
10161f519d am bc494d43: am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:33:24 -07:00
The Android Open Source Project
267e256808 am 65369424: merge from open-source master 
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken

* commit '65369424cbfbf165b4324bdcb6f138435462a196':
  Add keycodes PageUp and PageDown
 2010-04-08 11:29:23 -07:00
Scott Main
f507149a6a am 6b04d5c7: am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 
Merge commit '6b04d5c735df7fa05c705f979eff8821989ab73d' into kraken

* commit '6b04d5c735df7fa05c705f979eff8821989ab73d':
  docs: revisions to the installLocation documentation
 2010-04-08 11:29:19 -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
b64b585c79 am dd35ce8e: am 0dbec5f4: am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:19:07 -07:00
Jaikumar Ganesh
ef6429e272 am 0dbec5f4: am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:15:31 -07:00
Jaikumar Ganesh
b9ceaf375b am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 
Merge commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761' into kraken

* commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761':
  Don't allow connection to profiles in TURNING_OFF state.
 2010-04-08 10:12:57 -07:00
Fred Quintana
5cad556ce9 Merge "create a SyncManager WakeLock for each syncadapter accountType/authority pair so that it will be easy to tell via bugreport which sync adapter is holding the wake lock the most" 2010-04-08 10:12:43 -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
Dmitri Plotnikov
bc3d349290 Merge "Add the hidden ACTION_GET_MULTIPLE_PHONES and EXTRA_PHONE_URIS: a. Add the ACTION_GET_MULTIPLE_PHONES which will launch the contacts with multiple picker mode, and user can selected the multiple phones in the list of phone numbers. b. Add the EXTRA_PHONE_URIS which works with ACTION_PICK_MULTIPLE to specify the phone numbers should be selected by default when it is used as input or store the list of selected phone numbers when returnning from the activity." 2010-04-08 09:41:39 -07:00
Andrei Popescu
228ec386a1 am 4d232164: am ec472da7: am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:20:44 -07:00
Andrei Popescu
3324567b12 am ec472da7: am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:16:35 -07:00
Andrei Popescu
1e082df4fa am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 
Merge commit '1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken

* commit '1531d211249783bdfc3ded9323397f22a5f1fc34':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
 2010-04-08 09:12:43 -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
5382fd86e8 am 604c0371: 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 2010-04-08 08:47:37 -07:00
Andreas Huber
d6297df14f 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
07101b8df3 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
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
df14972da3 am aed9d41b: am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:38:27 -07:00
Daniel Sandler
b78f4acf42 am 59ff911b: am 8c66936a: am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo 2010-04-08 06:38:21 -07:00
Daniel Sandler
45d8e12a63 am 715896be: am 6fec76a0: am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:35:40 -07:00
Daniel Sandler
4db2474f27 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
7bcab219bb 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
0b3fc41b3f 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
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