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

87948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siva Velusamy
c0373dfdc1 Do not preload videoeditor_jni since it breaks the emulator 
Video editing is not supported on the emulator, so preloading
this causes the emulator to crash while booting up.

Bug 7200384

Change-Id: I1915d888be328c20aa66ca2318722d5b6e6342b0
 2012-09-24 10:34:42 -07:00
Robert Greenwalt
2b24e06a06 am 940eb097: am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit '940eb097278ae70c721a347dc5eee8e34fdbf191':
  Fix the build.
 2012-09-24 10:21:29 -07:00
Robert Greenwalt
940eb09727 am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
 2012-09-24 10:16:40 -07:00
The Android Open Source Project
cdc46670ee am fbba193d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'fbba193d3841b14bcfce02cdb9dd4715eb7dea39':
  Disable content observer cross-user permission checks...
  Disable content observer cross-user permission checks...
  Fix deadlock in LockPatternUtils by using local id.
  Compute GradientDrawable's opacity correctly
  Tweaking how settings adds keyguard widgets
  Settings provider needs to send notifications as itself
  Visualizer only works on sounds >5 sec.
  dodging the @JavascriptInterface bullet
  Fix crash in recents
  Wait for installd to finish starting before booting.
  Temporarily turn off package verification
 2012-09-24 10:14:52 -07:00
Robert Greenwalt
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -07:00
The Android Open Source Project
fbba193d38 Reconcile with jb-mr1-release - do not merge 
Change-Id: I37715a9d2489d282d09a60cf32d92f13c3d82b13
 2012-09-24 10:12:10 -07:00
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
f528e56de0 am 4f895c81: am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit '4f895c8143eef5e6bdc1f3a74c74b09bc1437a14':
  Skip operations for users who are not running
 2012-09-24 09:58:12 -07:00
Alon Albert
4f895c8143 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:00 -07:00
Alon Albert
d5aa6bd073 am d1631f76: am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit 'd1631f76b8e4797957cb85f4a8ce9926dd2c163b':
  Add columns to CalendarContract
 2012-09-24 09:54:16 -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
d1631f76b8 am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:51:02 -07:00
Amith Yamasani
1294230aa3 am ffdb4fb3: am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit 'ffdb4fb3f8eeac789a57d5b16dfb667ddb9ad21a':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:50:31 -07:00
Victoria Lease
089818fe14 am 5d0f02d9: am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '5d0f02d90cba9920b40159c56d85dbeed6862ddc':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:50:25 -07:00
Amith Yamasani
ffdb4fb3f8 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:47:00 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Victoria Lease
5d0f02d90c 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:46:53 -07:00
The Android Open Source Project
5f25993020 am f959ad7f: (-s ours) am 18fd992b: am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'f959ad7f0d9eaeff01702e8f443074c99378e92d':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
 2012-09-24 09:39:41 -07:00
Kenny Root
fd896079ea am e748729b: am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev 
* commit 'e748729b82bf287e153c40eab019e2c6bca33a3b':
  LockScreen: don't update KeyStore password on unlock
 2012-09-24 09:39:37 -07:00
John Spurlock
892c2278c6 am 0c8dfe34: am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '0c8dfe3486f5650cd7969ff6cbb52fd1cd716be4':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 09:39:34 -07:00
Jim Miller
fa3b11643b am fc74a44f: am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit 'fc74a44f3e2df846fb009fe326809ed76537265b':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 09:39:30 -07:00
Jeff Sharkey
dab41705e0 am 17505666: am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '175056661d1ec5219a6aec157544e510b9a47203':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 09:39:26 -07:00
Romain Guy
08d6526a5e am fff1e8af: am 6b3292ce: Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 
* commit 'fff1e8afba582cb97eeca75c6c1368ee74588891':
  Avoid deadlock when deleting layers Bug #7217459
 2012-09-24 09:39:23 -07:00
Irfan Sheriff
87151b7009 am 55f133fa: am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '55f133fafb0fb239759262d2c61fb0b58ae4dab4':
  Increase WFD connect time out to 60s
 2012-09-24 09:39:19 -07:00
Fabrice Di Meglio
793d9abb89 am c86c9fc0: am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c86c9fc092280cb961bf46e87050da9c46836278':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:15 -07:00
Jason Sams
42319175c7 am 36331fbc: am ac4bd00c: Change 5x5 convolve to better test impl. 
* commit '36331fbc36762a3667bf06ddbdd381971bbaf44c':
  Change 5x5 convolve to better test impl.
 2012-09-24 09:39:11 -07:00
Fabrice Di Meglio
c60a19e368 am 402bab75: am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '402bab75c360fd038910b3baedff54a1f4762c3d':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:07 -07:00
Stephen Hines
c5c6c72c5c am de6def1d: am 9c7b5291: Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev 
* commit 'de6def1d9a71a3d19cbe485f11c5cb5259581bac':
  Verify pass-by-value kernels with structs.
 2012-09-24 09:39:04 -07:00
Wink Saville
e9417314bd am 30f24dc8: am 8a06969d: Merge "Refactor Cell Location public API." into jb-mr1-dev 
* commit '30f24dc835b1758c7f86bde8ceeb4ff3523fe037':
  Refactor Cell Location public API.
 2012-09-24 09:39:00 -07:00
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