ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
33,743 Commits 2 Branches 0 Tags 54 MiB
4e0e61ea62
Commit Graph

33743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
3146d231cc am 63de615d: (-s ours) am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() 
* commit '63de615ddb3cb81bbb5b548693faca971d182a6d':
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
 2011-05-04 12:47:21 -07:00
Mike Lockwood
4fd1cf42b7 am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic 
* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
 2011-05-04 12:47:18 -07:00
Mike Lockwood
233c6b3270 am df889448: (-s ours) am a792c804: DO NOT MERGE MTP: Implement GetThumb command 
* commit 'df8894486c246a8c4e47cc2b3547e9c173225f34':
  DO NOT MERGE MTP: Implement GetThumb command
 2011-05-04 12:47:14 -07:00
Mike Lockwood
2ac2cc6c56 am af964a63: (-s ours) am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions 
* commit 'af964a632dafed7d56d1faf0427b9b9056346e20':
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
 2011-05-04 12:47:10 -07:00
Mike Lockwood
80d39922c8 am eeaf48ca: (-s ours) am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files 
* commit 'eeaf48ca8572b2fcb3fe05a22eb6759027924197':
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
 2011-05-04 12:47:06 -07:00
Mike Lockwood
cfea9a409d am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider 
* commit 'f6df5b41e145ee996ca4f94bec014ab3e41f0b21':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
 2011-05-04 12:47:02 -07:00
Marco Nelissen
614a822d87 am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix media scanner uri handling. 
* commit '863ee40964ef2a017a1116abe37c6b8ad466dd5e':
  DO NOT MERGE Fix media scanner uri handling.
 2011-05-04 12:46:57 -07:00
Mike Lockwood
20b571fd81 am 4397c324: (-s ours) am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
* commit '4397c3240240080cf17a1cd4dcaff87ab7cacb3a':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
 2011-05-04 12:46:52 -07:00
Mike Lockwood
56543aecfd am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: 
* commit '21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
 2011-05-04 12:46:47 -07:00
Mike Lockwood
b281bb0bf7 am 20c35612: (-s ours) am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot. 
* commit '20c356128492cf43d9ca10308601be585514f165':
  DO NOT MERGE MountService: Fix running media scanner at boot.
 2011-05-04 12:46:42 -07:00
Mike Lockwood
3e9ea2f73d am 2572051c: (-s ours) am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService 
* commit '2572051c4f6589e5ca8b21158a24a7fa606a5e67':
  DO NOT MERGE Fix deadlock in MountService
 2011-05-04 12:46:36 -07:00
Mike Lockwood
b88a9ad107 am a2a8419d: (-s ours) am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'a2a8419db82ae40146bdfd215e3de3be39c7249c':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 12:46:31 -07:00
Mike Lockwood
8421a0d794 am 60c768d4: (-s ours) am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes 
* commit '60c768d41277e3b7d4988452e15694c7ad5a74d0':
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-04 12:46:21 -07:00
Daniel Sandler
8f2ee7dd0e Merge "New art. FPO, of course." 2011-05-04 12:36:35 -07:00
Robert Ly
607059c45a am f0a1d683: am fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1 
* commit 'f0a1d683d9c45a2d5e8e22edaf991b1f9c5b4402':
  Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
 2011-05-04 12:33:54 -07:00
Robert Ly
329a7c4c1b am fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1 
* commit 'fd7974f531b8784e7d229d31dda228cca0e7c2d8':
  Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
 2011-05-04 12:27:39 -07:00
Robert Ly
7cbb613026 Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1 2011-05-04 12:18:09 -07:00
Jeff Sharkey
e47a9e29ab Merge "Avoid throwing when forceRefresh() missing server." 2011-05-04 11:58:55 -07:00
Andreas Huber
f297a14f58 Merge "Fix potential memory corruption in NuCachedSource2." 2011-05-04 11:50:48 -07:00
Daniel Sandler
5ff74322e4 Merge "On-screen navigation bar (separate from the status bar)." 2011-05-04 11:26:38 -07:00
Dan Morrill
55f6844c47 am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread. 
* commit 'dacce73bcc53a21125f532d8000e7ec2e3c30a35':
  Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
 2011-05-04 10:29:34 -07:00
Robert Greenwalt
8fdedfd3d3 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
 2011-05-04 10:02:16 -07:00
Robert Greenwalt
9f7aa4c665 Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Daniel Sandler
6e5734d0fa Merge "Start honeyphoning the notification panel." 2011-05-04 09:00:18 -07:00
Gloria Wang
a727fab344 Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever" 2011-05-04 09:00:15 -07:00
Mike Lockwood
2d479be9c6 am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() 
* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
 2011-05-04 08:57:59 -07:00
Mike Lockwood
609e1d9ac6 am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic 
* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
 2011-05-04 08:57:56 -07:00
Mike Lockwood
8ee4a063c1 am a792c804: DO NOT MERGE MTP: Implement GetThumb command 
* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
  DO NOT MERGE MTP: Implement GetThumb command
 2011-05-04 08:57:47 -07:00
Mike Lockwood
0910f9ac14 am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions 
* commit 'af50821bace87aa83c7faba7bf139cfcaccf317a':
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
 2011-05-04 08:57:44 -07:00
Mike Lockwood
b1771c1290 am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files 
* commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613':
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
 2011-05-04 08:57:41 -07:00
Mike Lockwood
8e8b339f8b am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider 
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
 2011-05-04 08:57:37 -07:00
Marco Nelissen
6b4abeb8b3 am 7dd59229: DO NOT MERGE Fix media scanner uri handling. 
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
  DO NOT MERGE Fix media scanner uri handling.
 2011-05-04 08:57:33 -07:00
Mike Lockwood
a2b52f231f am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
 2011-05-04 08:57:29 -07:00
Mike Lockwood
259d650c71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: 
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
 2011-05-04 08:57:23 -07:00
Mike Lockwood
dbd90e4157 am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot. 
* commit '10fbba21e4827a1582d97aa99e4e8d772ce04920':
  DO NOT MERGE MountService: Fix running media scanner at boot.
 2011-05-04 08:57:19 -07:00
Mike Lockwood
c45fd5afb4 am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService 
* commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
  DO NOT MERGE Fix deadlock in MountService
 2011-05-04 08:57:12 -07:00
Mike Lockwood
e5f7a9501f am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
6bf48f70f6 am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes 
* commit '346a2d79ecd627e38bc7fc6874fb627995b8bc12':
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-04 08:56:55 -07:00
Bjorn Bringert
3ede79dc28 Merge "Check for exceptions before calling back into Java" 2011-05-04 02:56:04 -07:00
Adam Powell
21c8466ef5 Merge "Fix bug 4361642 - Action menu unresponsive after orientation change" 2011-05-03 21:05:38 -07:00
Mathias Agopian
c83110d464 Merge "Fix a race in SurfaceFlinger that could cause layers to be leaked forever." 2011-05-03 20:46:38 -07:00
Mathias Agopian
dea20b1f34 Fix a race in SurfaceFlinger that could cause layers to be leaked forever. 
The transaction flags were atomically read-and-cleared to determine if
a transaction was needed, in the later case, mStateLock was taken to
keep the current state still during the transaction. This left a small
window open, where a layer could be removed after the transaction flags
were checked but before the transaction was started holding the lock.
In that situation eTraversalNeeded would be set but only seen during the
next transaction cycle; however, because we're handling this transaction
(because of another flag) it will be commited, "loosing" the information
about the layer being removed -- so when the next transaction cycle due
to eTraversalNeeded starts, it won't notice that layers have been removed
and won't populated the ditchedLayers array.

Change-Id: Iedea9e25fee8dd98a0c5bd5ad41a20fcadf75b47
 2011-05-03 20:44:51 -07:00
Adam Powell
33e85420b1 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Robert Ly
528bb11bd0 am 79eb7876: am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 
* commit '79eb78769c8ecd92624f0171d9f22d95fc093b00':
  Doc change: fixing minor bug for xml resources bug 4376713
 2011-05-03 17:03:21 -07:00
Glenn Kasten
91c0b6c508 am a98bcdf6: am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 
* commit 'a98bcdf61dda9d64b4f584ce34c76df79409916a':
  Account for race condition when attaching HDMI.
 2011-05-03 17:03:18 -07:00
Robert Ly
af35bf6440 am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 
* commit '88741823a67fd8246b3926464bfaa2081b330f40':
  Doc change: fixing minor bug for xml resources bug 4376713
 2011-05-03 16:59:34 -07:00
Glenn Kasten
9cff62220f am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 
* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
  Account for race condition when attaching HDMI.
 2011-05-03 16:59:31 -07:00
Robert Ly
68cc53fe03 am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
  Doc change: fixing minor bug for xml resources bug 4376713
 2011-05-03 16:57:52 -07:00
Glenn Kasten
3d8070ba89 am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.
 2011-05-03 16:57:45 -07:00
Robert Ly
f8647fc367 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00