drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,402 Commits 1 Branch 0 Tags
Commit Graph

48402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
862f161916 am c48dfd5d: (-s ours) am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit 'c48dfd5db6fa956be603d3c7479e3f672daea30e':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 16:40:30 -07:00
Robert Greenwalt
352f2c33d3 am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
  Fix some alt-network issues.
 2011-03-30 16:40:23 -07:00
Eric Fischer
ce8a55db6f am b97b78fe: (-s ours) am acf48255: am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b97b78fe61424bd1948bc0b8d039da356774614e':
  Import revised translations.  DO NOT MERGE
 2011-03-30 16:40:15 -07:00
Scott Main
4cead493fd am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 16:40:03 -07:00
Andreas Huber
05e11b29b2 am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 16:38:38 -07:00
The Android Open Source Project
67a8f940c0 am 761e4500: am 5e1383f2: am ad663d80: Merge from gingerbread 
* commit '761e4500f31fe59748a53a4f6a85daccf5cd3467':
  egl: fixes for object refcounts
 2011-03-30 16:38:24 -07:00
Brad Fitzpatrick
d117428bf9 am 5db7fd6b: am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '5db7fd6b70f47f31fbc59f92907b9807f9c4e64d':
  Error in compound cache-control header.
 2011-03-30 16:38:18 -07:00
Brad Fitzpatrick
36bafb0b7d am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 16:38:03 -07:00
Brad Fitzpatrick
b9d173ce8f am f6809853: am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit 'f68098534e42b33cd4588bb2d2ba34ab579e11aa':
  Unregister callback from binder when vibration is removed
 2011-03-30 16:37:58 -07:00
Mike Lockwood
d0b4e9611d am 08d5de83: am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit '08d5de83393dbd4d31893d96e4871a8a3628a2cd':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-30 16:33:40 -07:00
Jeff Hamilton
f9fb0abbd6 am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
  Update the value for the NFC shared UID.
 2011-03-30 16:31:27 -07:00
Teng-Hui Zhu
29c7ae5c60 Merge "Buffering in full screen mode will show progressView" 2011-03-30 16:19:07 -07:00
Teng-Hui Zhu
f4d4e9e05f Buffering in full screen mode will show progressView 
bug:4187252
Change-Id: Ieb7ae26b5bfa9abc79556e2fc063b7e3ef17ab52
 2011-03-30 16:05:27 -07:00
Mathias Agopian
a51e9fd53d Merge "Revert "retire android_native_window_t"" 2011-03-30 15:30:39 -07:00
Mathias Agopian
2c34190702 Revert "retire android_native_window_t" 
this type is still used by partner's source trees.
we will get rid of it in next release's timeframe.

This reverts commit 7b49b976277cb3538242151e7dbd24681ddec73e.
 2011-03-30 15:28:21 -07:00
Irfan Sheriff
c48dfd5db6 am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 15:18:23 -07:00
Robert Greenwalt
047f9d1297 Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-30 15:08:27 -07:00
Robert Greenwalt
6244f0fc16 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp 
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
 2011-03-30 15:03:13 -07:00
Eric Fischer
b97b78fe61 am acf48255: am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'acf48255aa3706489839948f153615e5c5cf38cb':
  Import revised translations.  DO NOT MERGE
 2011-03-30 14:46:44 -07:00
Eric Fischer
acf48255aa am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '91c482b2351db1221308fe90800b8ef8bddbed90':
  Import revised translations.  DO NOT MERGE
 2011-03-30 14:42:30 -07:00
Eric Fischer
91c482b235 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-30 14:39:25 -07:00
Eric Fischer
446b247834 Import revised translations. DO NOT MERGE 
Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65
 2011-03-30 14:25:28 -07:00
Andreas Huber
790ac975d2 Merge "Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files" 2011-03-30 13:48:10 -07:00
Andreas Huber
cabb7da712 Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files 
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
 2011-03-30 13:13:25 -07:00
Daniel Sandler
5317509129 Merge "Add missing dimension resource." 2011-03-30 12:56:09 -07:00
Daniel Sandler
bdf37690f3 Add missing dimension resource. 
Bug: 4192397
Change-Id: I1912fffc8800ef522063bf42ffe08e752ae1350f
 2011-03-30 15:25:38 -04:00
Scott Main
02a7f8eb3a am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5c35c05909640768bbe7f1ecef3165382825c31b':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:13:59 -07:00
Scott Main
5c35c05909 am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:12:15 -07:00
Scott Main
5b68c655a1 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00
Fabrice Di Meglio
4111bec3b6 Merge "Fix text redering issue where the text was sometimes truncated" 2011-03-30 12:01:52 -07:00
Adam Powell
5251940341 Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use" 2011-03-30 11:48:58 -07:00
Winson Chung
53ecd4f5cf Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent." 2011-03-30 11:44:08 -07:00
Adam Powell
54ab310e60 Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use 
Change-Id: Ieb8127772cd62663d11ef893b47f9b2c7068391c
 2011-03-30 11:34:00 -07:00
Andreas Huber
fc2143473a Merge "Stagefright DataSources now expose the underlying content mime type." 2011-03-30 11:26:04 -07:00
Andreas Huber
a2e57ca650 Stagefright DataSources now expose the underlying content mime type. 
Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.

Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
 2011-03-30 11:15:27 -07:00
James Dong
4d3cdb5515 Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE 
bug - 3373994

Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
 2011-03-30 10:54:58 -07:00
Winson Chung
037300bba5 Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent. 
Change-Id: I72edaa839ae0633a1a24d8f69f5f8c664832ed30
 2011-03-30 09:37:09 -07:00
Andreas Huber
66ec90687f am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:34:15 -07:00
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 am 568845a7: Merge "Fix some alt-network issues." into gingerbread 
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
 2011-03-30 09:30:15 -07:00
Andreas Huber
8de5df4392 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Mike Lockwood
3164a497a8 Merge "Remove logging from HardwareService flashlight calls" 2011-03-30 09:24:09 -07:00
Andreas Huber
ebf6a72b35 Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 2011-03-30 09:12:04 -07:00
The Android Open Source Project
761e4500f3 am 5e1383f2: am ad663d80: Merge from gingerbread 
* commit '5e1383f25782e553294bca387f3c072073416416':
  egl: fixes for object refcounts
 2011-03-30 08:21:29 -07:00
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Brad Fitzpatrick
0ddcc8bc60 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
Brad Fitzpatrick
f68098534e am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
 2011-03-30 08:20:51 -07:00
Jeff Brown
163ac289ae Merge "Support primitive ALT-TAB style navigation using Recent Apps." 2011-03-30 02:33:44 -07:00
Brian Carlstrom
07fe409787 Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)" 2011-03-29 22:35:40 -07:00
Mike Lockwood
08d5de8339 am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:17:36 -07:00