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

39578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
6d4372c3f4 am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread 
* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
 2011-01-12 15:30:41 -08:00
Jason Sams
b7ec54699f am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb 
* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
  WAR driver bug where surfaces of size 0 fail.
 2011-01-12 15:30:18 -08:00
Huahui Wu
f6a63f95a8 am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb 
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
  b/3344966 pan following the focus point instead the first point.
 2011-01-12 15:30:14 -08:00
Jason Sams
ef56ee316c Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb 2011-01-12 15:28:19 -08:00
Huahui Wu
5587305109 Merge "b/3344966 pan following the focus point instead the first point." into honeycomb 2011-01-12 15:27:16 -08:00
Jason Sams
ec30933c1d WAR driver bug where surfaces of size 0 fail. 
Change-Id: I72b356c4cfb71f2342479ca21238b763d02e729d
 2011-01-12 15:26:25 -08:00
Jason Sams
07e27a11e4 am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb 
* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
  Implement more of copy2DRange*
 2011-01-12 15:24:08 -08:00
Jason Sams
208a1c68ee Merge "Implement more of copy2DRange*" into honeycomb 2011-01-12 15:22:09 -08:00
Justin Ho
b1c9d782d0 am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb 
* commit '63be8dd178447fce289c940638cd37aa560d9de3':
  Updated notification sounds for trygon
 2011-01-12 15:08:24 -08:00
Romain Guy
b7a0fa5efb am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb 
* commit 'b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
  Reenable region composition pipeline for layers Bug #3341848
 2011-01-12 15:08:17 -08:00
Justin Ho
63be8dd178 Merge "Updated notification sounds for trygon" into honeycomb 2011-01-12 15:06:19 -08:00
Romain Guy
b08ea03c1b Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb 2011-01-12 15:06:18 -08:00
Romain Guy
c038ea358a Reenable region composition pipeline for layers 
Bug #3341848

It works this time!

Change-Id: I0d371d8b2c75c67d4ce5009ddb990fe5e55a0a27
 2011-01-12 15:08:47 -08:00
Xia Wang
3c5637a457 am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb 
* commit '1aaae92f990bad51d503fe692def01191fda4db7':
  Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896
 2011-01-12 15:03:41 -08:00
Jamie Gennis
f152f2efa6 am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb 
* commit '103198a10cc22a49270a787d04b8ab484d2ec235':
  Implement crop & transform for SurfaceTexture.
 2011-01-12 15:03:37 -08:00
Carl Shapiro
90a1810219 am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb 
* commit 'd688e5af1c95a8b5a482c146cd789c2be45f9663':
  Remove minimum heap size test now that the underlying interface is gone.
 2011-01-12 15:03:34 -08:00
Marco Nelissen
18aa2da202 am a8a656b0: Fix scanning of modified files. 
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
  Fix scanning of modified files.
 2011-01-12 15:03:28 -08:00
Kenny Root
c31e095e2b am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb 
* commit 'e7b2310a856889aa1e683104039033ada3f6b696':
  Make sure AppCacheTest casts to long
 2011-01-12 15:03:24 -08:00
Brad Fitzpatrick
ef5864f1bb am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb 
* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
  Unhide Content{Resolver,Provider}.call()
 2011-01-12 15:03:15 -08:00
Stephen Hines
564d360277 am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb 
* commit 'a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
  Unhide more of the RS APIs.
 2011-01-12 15:03:07 -08:00
Xia Wang
1aaae92f99 Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb 2011-01-12 14:58:46 -08:00
Jamie Gennis
103198a10c Merge "Implement crop & transform for SurfaceTexture." into honeycomb 2011-01-12 14:57:29 -08:00
Jason Sams
fb9f82ca4f Implement more of copy2DRange* 
Change-Id: Id6be481c4abc968df27e5bba1ed044262ec0f293
 2011-01-12 14:53:25 -08:00
Carl Shapiro
d688e5af1c Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb 2011-01-12 14:51:54 -08:00
Marco Nelissen
a8a656b0c5 Fix scanning of modified files. 
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
 2011-01-12 14:46:49 -08:00
Kenny Root
e7b2310a85 Merge "Make sure AppCacheTest casts to long" into honeycomb 2011-01-12 14:40:57 -08:00
Brad Fitzpatrick
2e3908097b Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb 2011-01-12 14:39:50 -08:00
Stephen Hines
a9b1b2a703 Merge "Unhide more of the RS APIs." into honeycomb 2011-01-12 14:39:11 -08:00
Huahui Wu
f147d456a5 b/3344966 pan following the focus point instead the first point. 
Change-Id: Iaed482c7c4e8a616cbabf8c5af706b8160c880b1
 2011-01-12 14:38:30 -08:00
Andreas Huber
156a3c9ba7 am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb 
* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
 2011-01-12 14:35:46 -08:00
James Dong
999fb5a5a9 am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
  Publish MediaMetadataRetriever.java as public API
 2011-01-12 14:35:35 -08:00
Kenny Root
6c46760b72 Make sure AppCacheTest casts to long 
AppCacheTest was multiplying two integers that were too large for
devices that had more free space than 32-bits could represent.

Hopefully no one releases devices with 1TB soon.

The testAppCacheClear test doesn't work currently because it has an
"imax" attribute that doesn't allow the disk to be filled up entirely.
It only writes a couple hundred MB before it gives up.

Bug: 3216419
Change-Id: Ie371f42211bab65f2c767b36d9837ce76922501e
 2011-01-12 14:33:55 -08:00
Andreas Huber
7928ca6f87 Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb 2011-01-12 14:33:51 -08:00
Dianne Hackborn
7ca0b1c586 am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb 
* commit 'a353581c65dba1ca5a27f33a05a0077ffdabf72a':
  Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...
 2011-01-12 14:33:15 -08:00
Romain Guy
dee6089c2d am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb 
* commit '2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
  Add logging to the new layers API.
 2011-01-12 14:33:10 -08:00
Romain Guy
1fc883b271 Add logging to the new layers API. 
Change-Id: I78b9426eb17de3e775aca9fafe4a50bd9c0785c4
 2011-01-12 14:31:55 -08:00
James Dong
068b41d5d4 Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 2011-01-12 14:31:34 -08:00
Mike Lockwood
0b44f6f588 am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database 
* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
  MediaScanner: Do not update the file path when updating records already in the database
 2011-01-12 14:30:53 -08:00
Dianne Hackborn
a353581c65 Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb 2011-01-12 14:29:34 -08:00
Romain Guy
2e0c52610b Merge "Add logging to the new layers API." into honeycomb 2011-01-12 14:29:15 -08:00
Mike Lockwood
7ff08aeb7e am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 
* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
  Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
 2011-01-12 14:28:37 -08:00
Mike Lockwood
b43982e10d am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb 
* commit 'c13db22581aebe0ad16a833e778eedf947eccd1f':
  Remove permission android.permission.WRITE_MEDIA_STORAGE
 2011-01-12 14:28:33 -08:00
Mike Lockwood
0dd9f4de3e MediaScanner: Do not update the file path when updating records already in the database 
The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-12 17:27:37 -05:00
Mike Lockwood
a29464335a Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 2011-01-12 14:25:13 -08:00
Mike Lockwood
c13db22581 Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb 2011-01-12 14:25:05 -08:00
Stephen Hines
b11e3d2b0e Unhide more of the RS APIs. 
Change-Id: I7ec5de42680a4184d3a1380ea7c35b6ba3cf13bf
 2011-01-12 14:24:35 -08:00
Carl Shapiro
d3b8eb098d Remove minimum heap size test now that the underlying interface is gone. 
Change-Id: I4431247286dfd93ad0c3af9ebbba2ece92c35308
 2011-01-12 14:20:27 -08:00
Brad Fitzpatrick
534c84c1ce Unhide Content{Resolver,Provider}.call() 
Change-Id: Ic7833b921f5a8e70ef7d565bfdf461e6e135ff1b
 2011-01-12 14:19:19 -08:00
Romain Guy
3aaff3aef4 Better debug info for layers. 
Change-Id: I816c2446a33a1135553eaeea2f89c7418641cfe1
 2011-01-12 14:18:47 -08:00
Romain Guy
1138401f34 am e465b117: Merge "Better debug info for layers." into honeycomb 
* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
  Better debug info for layers.
 2011-01-12 14:17:59 -08:00