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

85693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
026efcc0b8 Fix the build. 
Other side of change 229425: add the secure settings used to control
the source country used in premium-sms determination.

bug:7205426
Change-Id: I6c8fece4fdea9aeae72da70c5cbe45807197c7bc
 2012-09-24 10:03:21 -07:00
Alon Albert
3b086c921a am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit 'fcf0061ebf2a56f76f207460b39fb14f25779bfd':
  Skip operations for users who are not running
 2012-09-24 09:56:08 -07:00
Alon Albert
fcf0061ebf Merge "Skip operations for users who are not running" into jb-mr1-dev 2012-09-24 09:53:33 -07:00
Alon Albert
d4b191562d am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:50:10 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Amith Yamasani
bbad3f8d2f am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:40:49 -07:00
Amith Yamasani
888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12
 2012-09-24 09:26:37 -07:00
Victoria Lease
a06464b16d am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:05:04 -07:00
Victoria Lease
8658e1aa1f Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 2012-09-24 09:02:13 -07:00
The Android Open Source Project
68f62989af am 18fd992b: (-s ours) 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 08:51:56 -07:00
Kenny Root
ce9dfb82db 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 08:51:52 -07:00
Amith Yamasani
814f5ac3a1 am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" 
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 08:49:47 -07:00
John Spurlock
e151c6e804 am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '2ce1ae8e63b7ef1b3a4cf7497265db24f6cebcdb':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 08:48:27 -07:00
Jim Miller
fdf326f18c 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 08:48:23 -07:00
Jeff Sharkey
63001c679c am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '49397ac93ce3cf4fc38d00b1099a6cd9075cee8a':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 08:48:19 -07:00
Romain Guy
dc33472432 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 08:48:16 -07:00
Irfan Sheriff
c45d6362fd 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 08:48:10 -07:00
Fabrice Di Meglio
d865a54841 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 08:48:06 -07:00
Jason Sams
0db67cdb21 am ac4bd00c: Change 5x5 convolve to better test impl. 
* commit 'ac4bd00c1fd68a9db3112cc16a48d84b4d02421a':
  Change 5x5 convolve to better test impl.
 2012-09-24 08:48:02 -07:00
Fabrice Di Meglio
3e276b9966 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 08:47:57 -07:00
Stephen Hines
e79b62925b 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 08:47:52 -07:00
Wink Saville
8611f68a93 am 8a06969d: Merge "Refactor Cell Location public API." into jb-mr1-dev 
* commit '8a06969d5be623d4efd3bdf2c3ecddcde557eca7':
  Refactor Cell Location public API.
 2012-09-24 08:47:49 -07:00
Irfan Sheriff
41b409c9a5 am 335fff3f: Merge "P2p fixes" into jb-mr1-dev 
* commit '335fff3fc99269e656446bbe700cca56079e1379':
  P2p fixes
 2012-09-24 08:47:45 -07:00
Fabrice Di Meglio
8f3ba9fa1b 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 08:47:42 -07:00
Victoria Lease
f5f6bd66be 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 08:47:38 -07:00
Fabrice Di Meglio
16c84db706 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 08:47:35 -07:00
Romain Guy
f0d3375b19 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 08:47:32 -07:00
Dianne Hackborn
a611a53292 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 08:47:28 -07:00
Jeff Sharkey
7ba3dad8f0 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 08:47:24 -07:00
Jeff Sharkey
e2bb66f64c am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '11820f7386ce86fd89e9e6b49d9231dce6e1ed07':
  Allow acquiring ContentProviders across users.
 2012-09-24 08:47:17 -07:00
Dianne Hackborn
66c86dd38b am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
 2012-09-24 08:47:13 -07:00
Chet Haase
ff914e4c3e am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 
* commit '925b6a715f42296dee7d80c3a3b4024d264a3c97':
  Optimize glyph cache texture uploads
 2012-09-24 08:47:09 -07:00
Brian Carlstrom
ea28e107c3 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 08:47:05 -07:00
Adam Powell
ec01f0e7b5 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 08:47:02 -07:00
Fabrice Di Meglio
2d03704c0f am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '57d863c3c28e13ac299fda8ba30bf1d6644230c8':
  Fix the build
 2012-09-24 08:46:59 -07:00
Fabrice Di Meglio
4aadafb830 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 08:46:54 -07:00
Fabrice Di Meglio
4a3a6d11d0 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 08:46:51 -07:00
Jason Sams
f0ee7b6dbc am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 
* commit '067af95257e1f8007a3a1777c257760aed9947af':
  Force destroy scripts in imageProcessing.
 2012-09-24 08:46:47 -07:00
Eino-Ville Talvala
2cd624d9d3 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 08:46:42 -07:00
Baligh Uddin
5d12f119bb am 7b770b0e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b770b0ec4e5a1b7f1b9601433fb35e55658453d':
  Import translations. DO NOT MERGE
 2012-09-24 08:46:37 -07:00
Wu-cheng Li
4358c93892 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 08:46:34 -07:00
Winson Chung
7c7d78f60f 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 08:46:30 -07:00
Jim Miller
8146feea28 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 08:46:26 -07:00
Romain Guy
b29e4a20a5 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 08:46:23 -07:00
Dianne Hackborn
bbb3bd9b7c 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 08:46:19 -07:00
Svetoslav Ganov
5acc556c26 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 08:46:15 -07:00
Adam Cohen
e886e6a423 am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
 2012-09-24 08:46:12 -07:00
Amith Yamasani
018824cab0 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 08:46:08 -07:00
Jason Sams
f5f2f1cd85 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 08:46:05 -07:00
Jason Sams
0c158d61da am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev 
* commit '7546b5ff1625d80296c0cdcb09ad28e037ab7fb6':
  Add Mandelbrot test to ImageProcessing.
 2012-09-24 08:46:02 -07:00