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

13981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
674fd6f5a1 am c7418149: am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 
Merge commit 'c7418149fafc7ded51a527b1d756028b33af3ac0' into kraken

* commit 'c7418149fafc7ded51a527b1d756028b33af3ac0':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
 2010-03-31 09:54:12 -07:00
Andreas Huber
659623dd11 am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 
Merge commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp

* commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
 2010-03-31 09:51:33 -07:00
Andreas Huber
fffdeb00ae Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 09:48:22 -07:00
Robert Greenwalt
e45f2c5445 am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.
 2010-03-31 08:37:45 -07:00
Robert Greenwalt
178ff3da72 am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp

* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
  Fix HttpProxy.
 2010-03-31 08:35:16 -07:00
Robert Greenwalt
8aaf5a5113 Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00
Bjorn Bringert
174b935bdc am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract 
Merge commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken

* commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68':
  Support for apps search in apps provider contract
 2010-03-31 07:26:12 -07:00
Bjorn Bringert
906bcf2176 am 11a7ba36: Support for apps search in apps provider contract 
Merge commit '11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp

* commit '11a7ba367f39175f41300f384ec6e984bcc08d53':
  Support for apps search in apps provider contract
 2010-03-31 07:21:13 -07:00
Jeff Brown
8bf424f62d resolved conflicts for merge of d9ee01a9 to kraken 
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
 2010-03-30 23:49:17 -07:00
Jeff Brown
87ea1ee585 am 07330791: Show SD unavailable icon for apps on SD when ejected. 
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp

* commit '07330791116513710d879c45b2f095cd314cbfd0':
  Show SD unavailable icon for apps on SD when ejected.
 2010-03-30 23:32:12 -07:00
Dianne Hackborn
34d563e124 am b19b6fec: am 966fcb81: Revert "fix [2542425] memory leak during video recording" 
Merge commit 'b19b6fec04de14860efb47d59084a66bb288cc98' into kraken

* commit 'b19b6fec04de14860efb47d59084a66bb288cc98':
  Revert "fix [2542425] memory leak during video recording"
 2010-03-30 21:13:21 -07:00
Dianne Hackborn
6aa06014aa am 966fcb81: Revert "fix [2542425] memory leak during video recording" 
Merge commit '966fcb81eece9096040ccc185bb662335d3964cf' into froyo-plus-aosp

* commit '966fcb81eece9096040ccc185bb662335d3964cf':
  Revert "fix [2542425] memory leak during video recording"
 2010-03-30 21:10:45 -07:00
Dianne Hackborn
c85e12e075 Revert "fix [2542425] memory leak during video recording" 
This reverts commit 544592e14f8d7643238e40ba9879727497900f35.
 2010-03-30 21:04:17 -07:00
Mathias Agopian
38b0630853 am 65bfca37: am 544592e1: fix [2542425] memory leak during video recording 
Merge commit '65bfca37fe36c1caef3153c39aa41a273ab776ef' into kraken

* commit '65bfca37fe36c1caef3153c39aa41a273ab776ef':
  fix [2542425] memory leak during video recording
 2010-03-30 19:11:25 -07:00
Mathias Agopian
09a906591f am 544592e1: fix [2542425] memory leak during video recording 
Merge commit '544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp

* commit '544592e14f8d7643238e40ba9879727497900f35':
  fix [2542425] memory leak during video recording
 2010-03-30 19:06:51 -07:00
Mathias Agopian
77e26d6822 fix [2542425] memory leak during video recording 
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.

Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
 2010-03-30 19:02:59 -07:00
Fred Quintana
03e9028c55 am 4a2f285d: am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization 
Merge commit '4a2f285deafc996435ac20162abaeb21838c1c40' into kraken

* commit '4a2f285deafc996435ac20162abaeb21838c1c40':
  - changed periodic sync scheduling to just creating pending
 2010-03-30 18:42:20 -07:00
Fred Quintana
fd9a81ba8f am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization sync extra - 
Merge commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp

* commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
  - changed periodic sync scheduling to just creating pending
 2010-03-30 18:38:46 -07:00
Fred Quintana
e53dc0652d am c21e77fc: am 23243aca: missing current.xml change 
Merge commit 'c21e77fc894360885310998a2eae69ab22779c39' into kraken

* commit 'c21e77fc894360885310998a2eae69ab22779c39':
  missing current.xml change
 2010-03-30 18:29:32 -07:00
Fred Quintana
acc5dba1cc am 344ba661: am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - 
Merge commit '344ba661ab406759a91ecaba1378a4907971b119' into kraken

* commit '344ba661ab406759a91ecaba1378a4907971b119':
  some changes due to an API review
 2010-03-30 18:29:25 -07:00
Fred Quintana
63618db61f am 23243aca: missing current.xml change 
Merge commit '23243acabdf8ff6022395cf67632c8387d286989' into froyo-plus-aosp

* commit '23243acabdf8ff6022395cf67632c8387d286989':
  missing current.xml change
 2010-03-30 18:24:19 -07:00
Fred Quintana
73fbf6703c am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a 
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp

* commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
  some changes due to an API review
 2010-03-30 18:24:15 -07:00
Mike Lockwood
065aa8cded am 835f41da: (-s ours) am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 
Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken

* commit '835f41da7581747b6a03227bcd1e073074ea9329':
  Add support for GPS privacy lock.  DO NOT MERGE
 2010-03-30 17:35:18 -07:00
Mike Lockwood
8bbc1b619b am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 
Merge commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp

* commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
  Add support for GPS privacy lock.  DO NOT MERGE
 2010-03-30 17:32:24 -07:00
Mike Lockwood
964d29a953 Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 2010-03-30 17:29:41 -07:00
Daniel Lehmann
51387dbfc3 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query
 2010-03-30 17:05:42 -07:00
Daniel Lehmann
9aad16d6e5 am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
 2010-03-30 17:01:45 -07:00
Daniel Lehmann
53108f3901 Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 16:58:38 -07:00
Adam Powell
2829aa54c4 am 9ebc9f46: am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 
Merge commit '9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken

* commit '9ebc9f464f45ec30003cd30854188a376c6d155f':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
 2010-03-30 16:54:43 -07:00
Christopher Tate
86701c3aad am 82a8b363: am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper 
Merge commit '82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken

* commit '82a8b3632c28d18d58a585160163fbf63d0c9746':
  API CHANGE: @hide AbsoluteFileBackupHelper
 2010-03-30 16:54:39 -07:00
Adam Powell
dfb864451e am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 
Merge commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp

* commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
 2010-03-30 16:50:41 -07:00
Christopher Tate
a4a24e0bc2 am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper 
Merge commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp

* commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
  API CHANGE: @hide AbsoluteFileBackupHelper
 2010-03-30 16:50:36 -07:00
Adam Powell
07b8f00c47 Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 2010-03-30 16:46:21 -07:00
Dianne Hackborn
6c545b685e am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 
Merge commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken

* commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043':
  Fix issue #2553553: API REVIEW: android.context.Context
 2010-03-30 16:05:05 -07:00
Dianne Hackborn
e31835943b am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 
Merge commit '5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp

* commit '5cdd78589db7f31c59df2e40146bd761a6570d13':
  Fix issue #2553553: API REVIEW: android.context.Context
 2010-03-30 16:00:41 -07:00
Dianne Hackborn
48bcc5aa85 Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 2010-03-30 15:55:37 -07:00
Andreas Huber
c0ffdb7762 am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo 
Merge commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken

* commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c':
  Properly fill in the component name for the software decoders.
 2010-03-30 15:49:38 -07:00
Andreas Huber
b2d203c43b am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo 
Merge commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp

* commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
  Properly fill in the component name for the software decoders.
 2010-03-30 15:44:23 -07:00
Andreas Huber
f6517d2d75 Merge "Properly fill in the component name for the software decoders." into froyo 2010-03-30 15:40:38 -07:00
Amith Yamasani
37523777ff am e1331779: am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo 
Merge commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken

* commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5':
  Fix for Never not existing in latest timeout values.
 2010-03-30 15:27:35 -07:00
Amith Yamasani
27756e5d55 am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo 
Merge commit '95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp

* commit '95a321fcde17cbb79d89244eee3c1297c449b1a0':
  Fix for Never not existing in latest timeout values.
 2010-03-30 15:24:51 -07:00
Amith Yamasani
75713ec76b Merge "Fix for Never not existing in latest timeout values." into froyo 2010-03-30 15:19:00 -07:00
Grace Kloba
0604c62a01 am 19c1ea3b: am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken

* commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
  Remove the shadow under url bar.
 2010-03-30 14:59:19 -07:00
Grace Kloba
cbf14323dd am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit 'eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp

* commit 'eb643f2685bd404ef5abb622123cea0aa17939d7':
  Remove the shadow under url bar.
 2010-03-30 14:56:14 -07:00
Grace Kloba
3c21699f33 Merge "Remove the shadow under url bar." into froyo 2010-03-30 14:51:48 -07:00
David Turner
ecf9b68112 Merge "gl_code : add end of line." 2010-03-30 14:50:44 -07:00
Irfan Sheriff
e5c4da1b0c am 295eb97c: am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken

* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:55:21 -07:00
Irfan Sheriff
41093e83eb am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp

* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:51:46 -07:00
Dianne Hackborn
2d5d669e50 am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken

* commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
  Package manager optimizations.
 2010-03-30 13:42:50 -07:00
Dianne Hackborn
db0ee987d5 am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp

* commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
  Package manager optimizations.
 2010-03-30 13:40:24 -07:00