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

87764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
ea243aa656 am de378a33: am 335fff3f: Merge "P2p fixes" into jb-mr1-dev 
* commit 'de378a33c37b655eab2f59a3797a7549b06311e7':
  P2p fixes
 2012-09-24 09:38:56 -07:00
Fabrice Di Meglio
525926078b am 72d65718: am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '72d657182312c7bac049b3ed94a4658c3935ae28':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:51 -07:00
Victoria Lease
be4647685f am 8b21390a: am 17e3e9e5: Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev 
* commit '8b21390a31631942ad3065797f3dc316c35d5097':
  Do not use passive GPS data for COARSE only apps.
 2012-09-24 09:38:48 -07:00
Fabrice Di Meglio
42f11c981c am c81a319f: am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c81a319f1a2834590f1b7e5cfed0bbdba49d0838':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:43 -07:00
Romain Guy
dedfc85c83 am b2d62ee6: am d392b87e: Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev 
* commit 'b2d62ee6aa53e43ba09dee42cb70af31a8f5fbe5':
  Fix overdraw debug on QCOM
  Make sure we never bind to texture #0 Bug #7195815
 2012-09-24 09:38:40 -07:00
Dianne Hackborn
749bbe97ee am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 
* commit '55fd212f914a28d0a64202a09f0127fa0a1b4175':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
 2012-09-24 09:38:36 -07:00
Jeff Sharkey
340640219e am 27bb709a: am 5a370882: Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev 
* commit '27bb709abe66d084d5544e59c80c4e6aac693c21':
  Check READ_EXTERNAL enforcement outside of lock.
 2012-09-24 09:38:31 -07:00
Jeff Sharkey
5c7527ba15 am 8bc3cfa3: am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '8bc3cfa3674217e967b64340bae6f6003f332e66':
  Allow acquiring ContentProviders across users.
 2012-09-24 09:38:27 -07:00
Dianne Hackborn
eeb8f97993 am 2552e78a: am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit '2552e78a15d2a88dd0e885ebf9490f8f38d9a393':
  Fix issue #7209355, #7214271.
 2012-09-24 09:38:23 -07:00
Chet Haase
70c75cea88 am 21755bf5: am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 
* commit '21755bf51ce71a9ee6d1841af0e15f776dee9855':
  Optimize glyph cache texture uploads
 2012-09-24 09:38:19 -07:00
Brian Carlstrom
f0c6728ad4 am e3089736: am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev 
* commit 'e308973644d40887a07fe2e31a74c0697b31dedf':
  Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
 2012-09-24 09:38:16 -07:00
Adam Powell
5210aa3f58 am 140c78f7: am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev 
* commit '140c78f77c5a611953168fdac4dd122d16610494':
  Further tweak config_minScalingSpan for large screen devices
 2012-09-24 09:38:12 -07:00
Fabrice Di Meglio
54f49d8fa1 am 443e3f0b: am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '443e3f0b7e9025234e02396561b9a9f798c38d60':
  Fix the build
 2012-09-24 09:38:09 -07:00
Fabrice Di Meglio
63e080904d am a478de98: am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev 
* commit 'a478de98a3314df864373f291faa45362dda71bc':
  Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
 2012-09-24 09:38:05 -07:00
Fabrice Di Meglio
b59cddbaac am e477ff0c: am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev 
* commit 'e477ff0cde13de7996eb79fa2352cbfa3a3c5b75':
  Fix bug #7206086 NumberPicker widget should use locale digits
 2012-09-24 09:38:01 -07:00
Jason Sams
07e37dfac9 am 7e2048be: am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 
* commit '7e2048beb2195a24bdcb76be505eb0070cb2c9f7':
  Force destroy scripts in imageProcessing.
 2012-09-24 09:37:58 -07:00
Eino-Ville Talvala
19a58d2021 am 899d1efa: am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 
* commit '899d1efa4e83e1e01e885f30450380996bbe69fc':
  Unhide and document feature android.hardware.camera.any.
 2012-09-24 09:37:54 -07:00
Baligh Uddin
aa11714664 am 3ad3cc49: (-s ours) am 7b770b0e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '3ad3cc49706bf87ec129195b0d731b37adad958b':
  Import translations. DO NOT MERGE
 2012-09-24 09:37:50 -07:00
Wu-cheng Li
802fcef997 am 9058a265: am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 
* commit '9058a26588be24a54b7c6e4cf1ac71fc53901148':
  Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
 2012-09-24 09:37:46 -07:00
Winson Chung
0e604e6c79 am 3ce29376: am c4b16f1a: Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev 
* commit '3ce29376f31344809d6369c0cd421be4fca38c89':
  Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)
 2012-09-24 09:37:42 -07:00
Jim Miller
6513af38a7 am 9c8a97e6: am 1cd5522f: Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev 
* commit '9c8a97e626213f8063d71072a36aa192bdf72470':
  Send USER_PRESENT for keyguard choice "None"
 2012-09-24 09:37:38 -07:00
Romain Guy
d2926e4a25 am 454f2be1: am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev 
* commit '454f2be11f028b49d28154103996a3e71e935272':
  Add support for a new developer setting: overdraw debugging
 2012-09-24 09:37:34 -07:00
Dianne Hackborn
79cc83f8d8 am 6e40deb8: am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 
* commit '6e40deb81cbee41f4f4611f30854bd1d8a928d53':
  Fix issue #7214462: Some recent thumbnails are black.
 2012-09-24 09:37:31 -07:00
Svetoslav Ganov
0f85c577f5 am 66b6dc69: am 9f12373b: Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 
* commit '66b6dc69644d7d232ce4b4490eca2c1d7659bb98':
  Fixing a regression in the UI test automation.
 2012-09-24 09:37:27 -07:00
Adam Cohen
4ae5254372 am a035cdac: am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit 'a035cdac93cf0519d6d81b4d6f3edbb442fa9ba8':
  Fixing typos
 2012-09-24 09:37:23 -07:00
Amith Yamasani
bd565c3ce5 am 56be4dd8: am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 
* commit '56be4dd85f09c6f0bfdc1108c513569363013013':
  Show lockscreen widgets for the current user.
 2012-09-24 09:37:20 -07:00
Jason Sams
ff8e158801 am e7812aa7: am 82c8cdab: Merge "Add run all button to image processing test." into jb-mr1-dev 
* commit 'e7812aa7193a7e8ee1a16af58455f85073d1264a':
  Add run all button to image processing test.
 2012-09-24 09:37:16 -07:00
Jason Sams
b86f5848ad am 4645a871: am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev 
* commit '4645a871780122678b9bb09b72728a2d7d9728b0':
  Add Mandelbrot test to ImageProcessing.
 2012-09-24 09:37:12 -07:00
Eino-Ville Talvala
d2ac940117 am 35f0ee64: am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev 
* commit '35f0ee64899f265eebddf75a31be3b3187529c72':
  Add hardware feature android.hardware.camera.any.
 2012-09-24 09:37:08 -07:00
Jim Miller
d7aa6110f1 am 99b0d436: am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev 
* commit '99b0d43645afb2dfd81e1c2ea080de7199fae239':
  Remove UID checks from LockPatternUtils
 2012-09-24 09:37:04 -07:00
The Android Open Source Project
f959ad7f0d am 18fd992b: am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '18fd992b2da203a268e3c1b345c040d36ac3dc84':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
 2012-09-24 09:30:08 -07:00
Kenny Root
e748729b82 am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev 
* commit 'c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc':
  LockScreen: don't update KeyStore password on unlock
 2012-09-24 09:30:04 -07:00
John Spurlock
0c8dfe3486 am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '2ce1ae8e63b7ef1b3a4cf7497265db24f6cebcdb':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 09:29:26 -07:00
Jim Miller
fc74a44f3e am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit '26c5686b7e3bf0ba238c55caa3e86447bab7cc61':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 09:29:22 -07:00
Jeff Sharkey
175056661d am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '49397ac93ce3cf4fc38d00b1099a6cd9075cee8a':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 09:29:18 -07:00
Romain Guy
fff1e8afba am 6b3292ce: Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 
* commit '6b3292ce5b3908c7433503f64c852cf2b27718ed':
  Avoid deadlock when deleting layers Bug #7217459
 2012-09-24 09:29:14 -07:00
Irfan Sheriff
55f133fafb am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '916b2b5a932a3be1a1363ac1871e74ad8b314f00':
  Increase WFD connect time out to 60s
 2012-09-24 09:29:11 -07:00
Fabrice Di Meglio
c86c9fc092 am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'f7a3e979a7ab3be4715408b6328f27e56a7c9326':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:29:07 -07:00
Jason Sams
36331fbc36 am ac4bd00c: Change 5x5 convolve to better test impl. 
* commit 'ac4bd00c1fd68a9db3112cc16a48d84b4d02421a':
  Change 5x5 convolve to better test impl.
 2012-09-24 09:29:03 -07:00
Fabrice Di Meglio
402bab75c3 am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'be4c5dd9d0b3ec1e020431f0e618a4cf38f9c57d':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:29:00 -07:00
Stephen Hines
de6def1d9a am 9c7b5291: Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev 
* commit '9c7b529125380de5721c1d5803d2e626a3e7ac17':
  Verify pass-by-value kernels with structs.
 2012-09-24 09:28:55 -07:00
Wink Saville
30f24dc835 am 8a06969d: Merge "Refactor Cell Location public API." into jb-mr1-dev 
* commit '8a06969d5be623d4efd3bdf2c3ecddcde557eca7':
  Refactor Cell Location public API.
 2012-09-24 09:28:52 -07:00
Irfan Sheriff
de378a33c3 am 335fff3f: Merge "P2p fixes" into jb-mr1-dev 
* commit '335fff3fc99269e656446bbe700cca56079e1379':
  P2p fixes
 2012-09-24 09:28:48 -07:00
Fabrice Di Meglio
72d6571823 am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '239e430578fd2d3bd38a646595a82bca95359bd7':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:28:44 -07:00
Victoria Lease
8b21390a31 am 17e3e9e5: Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev 
* commit '17e3e9e53c5fb9c92c8972a8d92659c6bef85831':
  Do not use passive GPS data for COARSE only apps.
 2012-09-24 09:28:41 -07:00
Fabrice Di Meglio
c81a319f1a am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'e3f2ac9e526e5b4de4d2ae113e644c1cb14b1ce6':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:28:36 -07:00
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