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

86278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
b2d62ee6aa am d392b87e: Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev 
* commit 'd392b87e3d30cd4f0836623d848019c5724efce8':
  Fix overdraw debug on QCOM
  Make sure we never bind to texture #0 Bug #7195815
 2012-09-24 09:28:33 -07:00
Dianne Hackborn
55fd212f91 am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 
* commit 'c0e1f268451550368d1d3d3558f8ce2459ed5713':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
 2012-09-24 09:28:29 -07:00
Jeff Sharkey
27bb709abe am 5a370882: Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev 
* commit '5a370882f87321629f98f6149ac946a57e25dfa8':
  Check READ_EXTERNAL enforcement outside of lock.
 2012-09-24 09:28:25 -07:00
Jeff Sharkey
8bc3cfa367 am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '11820f7386ce86fd89e9e6b49d9231dce6e1ed07':
  Allow acquiring ContentProviders across users.
 2012-09-24 09:28:22 -07:00
Dianne Hackborn
2552e78a15 am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
 2012-09-24 09:28:18 -07:00
Chet Haase
21755bf51c am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 
* commit '925b6a715f42296dee7d80c3a3b4024d264a3c97':
  Optimize glyph cache texture uploads
 2012-09-24 09:28:14 -07:00
Brian Carlstrom
e308973644 am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev 
* commit '5a009dcc58a46c41f1b54ccffca7d1317bbbff18':
  Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
 2012-09-24 09:28:11 -07:00
Adam Powell
140c78f77c am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev 
* commit 'bda527eca601b27ae66b6a93819cbe934e5ec782':
  Further tweak config_minScalingSpan for large screen devices
 2012-09-24 09:28:07 -07:00
Fabrice Di Meglio
443e3f0b7e am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '57d863c3c28e13ac299fda8ba30bf1d6644230c8':
  Fix the build
 2012-09-24 09:28:03 -07:00
Fabrice Di Meglio
a478de98a3 am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev 
* commit '415f26b73c90d07b9ec232ae4bd6bec59b28ddf8':
  Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
 2012-09-24 09:27:59 -07:00
Fabrice Di Meglio
e477ff0cde am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev 
* commit '5c2591e6eff3233c7f9c5bbae0dd20c1320f0854':
  Fix bug #7206086 NumberPicker widget should use locale digits
 2012-09-24 09:27:56 -07:00
Jason Sams
7e2048beb2 am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 
* commit '067af95257e1f8007a3a1777c257760aed9947af':
  Force destroy scripts in imageProcessing.
 2012-09-24 09:27:52 -07:00
Eino-Ville Talvala
899d1efa4e am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 
* commit 'a91c9f9f7a3c5d09333bdf27ef06012bb4e7d710':
  Unhide and document feature android.hardware.camera.any.
 2012-09-24 09:27:48 -07:00
Baligh Uddin
3ad3cc4970 am 7b770b0e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b770b0ec4e5a1b7f1b9601433fb35e55658453d':
  Import translations. DO NOT MERGE
 2012-09-24 09:27:44 -07:00
Wu-cheng Li
9058a26588 am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 
* commit '29f5230dc604537a72842a70991bae71019f8c80':
  Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
 2012-09-24 09:27:40 -07:00
Winson Chung
3ce29376f3 am c4b16f1a: Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev 
* commit 'c4b16f1acb3b81c7bdee36b48de01cd5d7a96d5b':
  Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)
 2012-09-24 09:27:32 -07:00
Jim Miller
9c8a97e626 am 1cd5522f: Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev 
* commit '1cd5522fcc16b6a7d38f7f4d2997359759196856':
  Send USER_PRESENT for keyguard choice "None"
 2012-09-24 09:27:28 -07:00
Romain Guy
454f2be11f am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev 
* commit '8e586f61dd4f7fa53b01e63ac779ffc7cde05bdd':
  Add support for a new developer setting: overdraw debugging
 2012-09-24 09:27:24 -07:00
Dianne Hackborn
6e40deb81c am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 
* commit '88923c973e3b58593c4d0fb6724addcefc53004f':
  Fix issue #7214462: Some recent thumbnails are black.
 2012-09-24 09:27:20 -07:00
Svetoslav Ganov
66b6dc6964 am 9f12373b: Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 
* commit '9f12373b57bcd7e7c156306aee50ac4e4fdee58a':
  Fixing a regression in the UI test automation.
 2012-09-24 09:27:17 -07:00
Adam Cohen
a035cdac93 am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
 2012-09-24 09:27:13 -07:00
Amith Yamasani
56be4dd85f am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 
* commit '77e95d3d71f10a0d936445e3f3ed90e15c019024':
  Show lockscreen widgets for the current user.
 2012-09-24 09:27:08 -07:00
Jason Sams
e7812aa719 am 82c8cdab: Merge "Add run all button to image processing test." into jb-mr1-dev 
* commit '82c8cdabc4161763cecaa9050bd2c544cc89e283':
  Add run all button to image processing test.
 2012-09-24 09:27:04 -07:00
Jason Sams
4645a87178 am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev 
* commit '7546b5ff1625d80296c0cdcb09ad28e037ab7fb6':
  Add Mandelbrot test to ImageProcessing.
 2012-09-24 09:27:01 -07:00
Eino-Ville Talvala
35f0ee6489 am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev 
* commit 'c9108b1856c7b6d98ddc04fbe330df21f2da890d':
  Add hardware feature android.hardware.camera.any.
 2012-09-24 09:26:57 -07:00
Jim Miller
99b0d43645 am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev 
* commit '6eeff850b245bd3be3a0e782cd9f28daadf922dc':
  Remove UID checks from LockPatternUtils
 2012-09-24 09:26:53 -07:00
Romain Guy
d392b87e3d Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev 
* changes:
  Fix overdraw debug on QCOM
  Make sure we never bind to texture #0 Bug #7195815
 2012-09-23 15:00:46 -07:00
Romain Guy
4285de3c8b Fix overdraw debug on QCOM 
Disable the use of the tiling extension when overdraw debug is
turned on.

Change-Id: Ib0a0b7d1998146aa0c7efef2d3822f9997efb123
 2012-09-23 14:46:35 -07:00
Romain Guy
574cf6070d Make sure we never bind to texture #0 
Bug #7195815

Change-Id: Ibec4b2aa4c580419eb5eb61adae6c9c960694d0c
 2012-09-23 14:45:31 -07:00
Dianne Hackborn
c0e1f26845 Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 2012-09-23 13:31:33 -07:00
Dianne Hackborn
3b84206bba Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot 
Don't kill the system uid if we are running out of RAM.

Change-Id: Ie1818a3241fc80d4dfa19f8e8bdad22d164d7baa
 2012-09-23 13:29:44 -07:00
Jeff Sharkey
5a370882f8 Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev 2012-09-23 13:23:39 -07:00
Jeff Sharkey
11820f7386 Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 2012-09-23 13:22:27 -07:00
Dianne Hackborn
b939e35274 Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 2012-09-23 12:58:10 -07:00
Dianne Hackborn
8da429e80d Fix issue #7209355, #7214271. 
Issue #7209355: Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271: Crash in system UI

Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.

Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
 2012-09-23 12:53:34 -07:00
Chet Haase
925b6a715f Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 2012-09-23 12:36:21 -07:00
Brian Carlstrom
5a009dcc58 Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev 2012-09-23 12:25:31 -07:00
Chet Haase
b92d8f7979 Optimize glyph cache texture uploads 
Only upload the changed area of the glyph cache, not the entire
bitmap. Note that we can't do the full-on optimization here of copying a sub-rect
of the bitmap because of GL ES 2 limitations, but we can at least copy the
horizontal stripe containing the dirty rect, which can still be a big
savings over uploading the entire bitmap.

Issue #7158326 Bad framerates on MR1 (Mako, Manta, Prime)

Change-Id: Iab38d53202650f757ead4658cf4287bdad2b3cb9
 2012-09-23 12:16:02 -07:00
Adam Powell
bda527eca6 Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev 2012-09-23 12:05:23 -07:00
Fabrice Di Meglio
57d863c3c2 Merge "Fix the build" into jb-mr1-dev 2012-09-23 12:00:03 -07:00
Adam Powell
c96a7fba2d Further tweak config_minScalingSpan for large screen devices 
Change-Id: Ibad70e41eed0e20f399dab275ac156eceed9d52f
 2012-09-23 11:59:57 -07:00
Fabrice Di Meglio
a65fe884d1 Fix the build 
Change-Id: Ia021742fb33671f9ece48180789757297fa60001
 2012-09-23 11:54:51 -07:00
Fabrice Di Meglio
415f26b73c Merge "Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales" into jb-mr1-dev 2012-09-23 11:11:52 -07:00
Fabrice Di Meglio
5c2591e6ef Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev 2012-09-23 11:10:40 -07:00
Jason Sams
067af95257 Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 2012-09-23 11:02:11 -07:00
Jason Sams
ed0b4f961f Force destroy scripts in imageProcessing. 
bug 7216044

Change-Id: I6292513c08e75269e79d2210de898ef28931c986
 2012-09-23 10:59:35 -07:00
Eino-Ville Talvala
a91c9f9f7a Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 2012-09-23 10:14:22 -07:00
Baligh Uddin
7b770b0ec4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-23 09:32:24 -07:00
Wu-cheng Li
29f5230dc6 Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 2012-09-23 02:21:17 -07:00
Jeff Sharkey
c50f31d213 Check READ_EXTERNAL enforcement outside of lock. 
Since SettingsProvider can call back into PMS, query the default
enforcement state before acquiring mPackages lock.

Bug: 7182437
Change-Id: Ie218aedfc7a943e5b221814af3e0356c7199b0e4
 2012-09-22 17:14:02 -07:00