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

39847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Romain Guy
e465b11745 Merge "Better debug info for layers." into honeycomb 2011-01-12 14:15:59 -08:00
James Dong
11eab056dd Publish MediaMetadataRetriever.java as public API 
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc

o part of a multi-project change.

bug - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
 2011-01-12 14:14:11 -08:00
Justin Ho
f9f66848c3 Updated notification sounds for trygon 
Change-Id: Ibd253e409e588f2c3eeb1514d4f5ae31c62d373a
 2011-01-12 14:12:08 -08:00
Gilles Debunne
ee3aadbc95 am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb 
* commit '54c38bf05da42e40b8726ab2b5a33762081e9345':
  New QuickContactBadge holo style.
 2011-01-12 14:09:42 -08:00
Gilles Debunne
54c38bf05d Merge "New QuickContactBadge holo style." into honeycomb 2011-01-12 14:07:26 -08:00
Jason parks
56aa5321fe Add a method enable encryption. 
This is for testing and needs to be cleaned up.

Change-Id: I29958f2a95c7773744e61bbd23a302b752614f87
 2011-01-12 16:00:23 -06:00
Jaikumar Ganesh
471de1f5b3 am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
 2011-01-12 13:58:17 -08:00
Jaikumar Ganesh
c8f42fb698 Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 2011-01-12 13:56:13 -08:00
Eric Laurent
48f400c376 am bec4abaa: Merge "Fix issue 3302649." into gingerbread 
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
 2011-01-12 13:52:42 -08:00
Eric Laurent
bec4abaa12 Merge "Fix issue 3302649." into gingerbread 2011-01-12 13:50:51 -08:00
Justin Ho
58ea93945b am 7b667a0c: Merge "Updated flightmode assets" into gingerbread 
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
  Updated flightmode assets
 2011-01-12 13:50:25 -08:00
Jaikumar Ganesh
d50ac2966e DO NOT MERGE: Remove auto connection on ACL connection. 
There is no need for this and causes problems with certian cars.

Fixes bug: 3281016

Change-Id: Idb65bbd4c8573923ebf82195b828ae071cb20aef
 2011-01-12 13:50:06 -08:00
Justin Ho
7b667a0c4b Merge "Updated flightmode assets" into gingerbread 2011-01-12 13:47:59 -08:00
Justin Ho
8e8c8e02d5 Updated flightmode assets 
Change-Id: Ia26da7982822d818f8416a110a21d17d316d7b3f
 2011-01-12 13:43:20 -08:00
Wink Saville
c9330ddcf4 Initialize mOtaspMode to OTASP_UNKNOWN. 
Without the explicit initialized the default value was 0 which
is OTASP_UNINITIALIZED instead it should be OTASP_UNKNOWN.

Change-Id: I44ffc60618c0b1d49e07ccbce408c4e9921d8130
 2011-01-12 13:37:38 -08:00
Jason Sams
fc6528ecd1 am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 
* commit '8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
  Cleanup bitmap uploads Implement standalone mipmap generation.
 2011-01-12 13:33:22 -08:00
Jason Sams
8f597fdfac Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 2011-01-12 13:30:41 -08:00
Jason Sams
f7086090cf Cleanup bitmap uploads 
Implement standalone mipmap generation.

Change-Id: Ie3a9781bbe50e2f58adca6f184d84fea50e40263
 2011-01-12 13:28:37 -08:00
Dianne Hackborn
2e7ffa54c1 Fix issue #3344089: runtime restart due to java.lang.StackOverflowError... 
...in WindowManager after app force closed a few times

Change-Id: I9d5ff16b01d14030150ba0904a47635f9c7a158f
 2011-01-12 13:21:28 -08:00
Amith Yamasani
c738ef5b30 am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb 
* commit 'fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
  Use light preference panel drawable for Theme.Light
 2011-01-12 13:20:04 -08:00
Amith Yamasani
fb0a242be6 Merge "Use light preference panel drawable for Theme.Light" into honeycomb 2011-01-12 13:18:20 -08:00
Jim Miller
530f77ea61 am a3a078e3: Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb 
* commit 'a3a078e34317763ad1294e0164c147074584e2e8':
  Fix 3201849: Use custom Drawable for bg in lockscreen
 2011-01-12 13:16:56 -08:00
Jim Miller
a3a078e343 Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb 2011-01-12 13:14:33 -08:00
Dianne Hackborn
45a1ada570 am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb 
* commit '02e852f968bac83947cd97a5fe7c7a7064774c5a':
  Make ProgressDialog a little less lame.
 2011-01-12 13:01:42 -08:00
Jason parks
1125d780a8 Remove the APIs for the old encryption scheme. 
Change-Id: I55116a5b29b10dfd50015805ec019b485257f68b
 2011-01-12 15:01:34 -06:00