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

39533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Romain Guy
1fc883b271 Add logging to the new layers API. 
Change-Id: I78b9426eb17de3e775aca9fafe4a50bd9c0785c4
 2011-01-12 14:31:55 -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
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
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 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
Dianne Hackborn
02e852f968 Merge "Make ProgressDialog a little less lame." into honeycomb 2011-01-12 12:59:27 -08:00
Romain Guy
5ecceb7df7 am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb 
* commit '853548287ffe4eb85d1bd10669270292336d137a':
  Cleanup GL objects on the correct thread.
 2011-01-12 12:52:41 -08:00
Romain Guy
853548287f Merge "Cleanup GL objects on the correct thread." into honeycomb 2011-01-12 12:50:50 -08:00
Romain Guy
57066eb64c Cleanup GL objects on the correct thread. 
Change-Id: Iddfea6e08a6591a4fab147151098ef27005f373d
 2011-01-12 12:53:32 -08:00
Romain Guy
9454fe1080 Fix CTS test. 
Bug #3345445

Change-Id: I3e9fa6002d173e6c9182ee5798420829e4bd2e30
 2011-01-12 12:50:05 -08:00
Romain Guy
b353b3ca7a am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb 
* commit 'cf894c91a9b6c7749c9bb325c9e54336b97df900':
  Fix CTS test. Bug #3345445
 2011-01-12 12:49:35 -08:00
Romain Guy
cf894c91a9 Merge "Fix CTS test. Bug #3345445" into honeycomb 2011-01-12 12:47:30 -08:00
Kenny Root
aee96e9773 am 5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb 
* commit '5e9ba49f5efed4f0adc7ffcf5052668cdfd92a25':
  Skip SD card tests on devices without SD cards
 2011-01-12 12:30:17 -08:00
Kenny Root
5e9ba49f5e Merge "Skip SD card tests on devices without SD cards" into honeycomb 2011-01-12 12:28:39 -08:00
Kenny Root
3c67689584 Skip SD card tests on devices without SD cards 
Tests were giving false failures when they should instead be skipped.
Forcing an install to an SD card on a device without one shouldn't count
as a failure. It's expected behavior.

Bug: 3216422
Change-Id: Ia523861d1331e74c76b434f7ba73b642d474a9cc
 2011-01-12 12:26:26 -08:00
Jaikumar Ganesh
7347f5e830 am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 
* commit '95a4751f2111d5d7c03c131e9d9dfad6cc32ceed':
  Add ability to parse keyboard fixed pin auto pair blacklist.
 2011-01-12 12:25:01 -08:00
Jaikumar Ganesh
5e2f9db3f1 am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb 
* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3':
  Revert "Add temporary hack for keyboards not following spec."
 2011-01-12 12:24:57 -08:00
Jaikumar Ganesh
95a4751f21 Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 2011-01-12 12:22:57 -08:00
Jaikumar Ganesh
fc019bd4fa Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb 2011-01-12 12:22:50 -08:00
Leon Scroggins
6fcaec5076 am 1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb 
* commit '1415bb7a948e0add9f6beb6dccbea70e9d2bedd0':
  Differentiate between clicks for focus and actual clicks.
 2011-01-12 12:03:24 -08:00
Leon Scroggins
1415bb7a94 Merge "Differentiate between clicks for focus and actual clicks." into honeycomb 2011-01-12 12:01:31 -08:00
Kenny Root
c669559dc3 am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb 
* commit 'b5a4b5d300bc05a969181155a4f155a79241f792':
  Allow updated system apps to retain priority
 2011-01-12 12:00:13 -08:00
Kenny Root
b5a4b5d300 Merge "Allow updated system apps to retain priority" into honeycomb 2011-01-12 11:58:11 -08:00
Kenny Root
502e9a47c6 Allow updated system apps to retain priority 
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.

Cherry-pick from gingerbread branch

Bug: 2572398
Change-Id: I95d8b6360bf7a3f39cd7a1ff09e1ee57e11583d8
 2011-01-12 11:57:23 -08:00
Jaikumar Ganesh
f487d72215 Add ability to parse keyboard fixed pin auto pair blacklist. 
Try auto pairing with such keyboards.
Also fix bug where dynamic auto pairing file was not being created.

Change-Id: I93afb96fee8bc4f245f96ec5961979c620de7948
 2011-01-12 11:56:15 -08:00
James Dong
5df82ef953 am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb 
* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
  Speed up MP3Extractor using cached reads
 2011-01-12 11:56:01 -08:00
Alex Sakhartchouk
941f86590c am 27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb 
* commit '27d116085ebbb112ec1fd959763a027ec08f7179':
  Adding ability to load cubemaps from individual faces.
 2011-01-12 11:55:54 -08:00
James Dong
cb0f6d0b42 Merge "Speed up MP3Extractor using cached reads" into honeycomb 2011-01-12 11:54:32 -08:00
Alex Sakhartchouk
27d116085e Merge "Adding ability to load cubemaps from individual faces." into honeycomb 2011-01-12 11:53:42 -08:00
Dianne Hackborn
4389434c1d Make ProgressDialog a little less lame. 
Change-Id: Ic3f1dd8ba32dd02d422ee6f05fff5541e54bb8a1
 2011-01-12 11:17:17 -08:00