85263 Commits

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
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -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
fcf0061ebf Merge "Skip operations for users who are not running" into jb-mr1-dev 2012-09-24 09:53:33 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -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
8658e1aa1f Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 2012-09-24 09:02:13 -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
The Android Open Source Project
18fd992b2d am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'a07cbb96f34198b6cfda05d39a02c9220a9722cf':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
2012-09-24 08:45:15 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
2012-09-24 08:45:14 -07:00
Kenny Root
c6f8a9985b Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev 2012-09-24 08:43:34 -07:00
The Android Open Source Project
a07cbb96f3 Reconcile with jb-mr0-release - do not merge
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
2012-09-24 07:39:06 -07:00
John Spurlock
2ce1ae8e63 Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 2012-09-24 05:52:46 -07:00
Bart Sears
562c45cc84 Updated versions of DroidSansFallback
Latest versions of DroidSansFallback from Monotype.

The DroidSansFallback.ttf file has some additional glyphs and
glyph fixes (including a fix for bug 6723057 and will likely fix
bug 6629748).  It continues to cover Korean Hangul but does not
cover CJK Ext A (for space reasons on small system image devices).
The DroidSansFallbackFull.ttf file has the bug fixes listed and
also removes the Korean Hangul because we are now going to use
NanumGothic for Korean (NanumGothic.ttf is added in a separate
CL in the external/naver-fonts directory).

The falback_fonts.xml file has been modified to add NanumGothic.ttf
before DroidSansFallback.

Bug: 4531601
Bug: 6723057
Bug: 6629748
Change-Id: I670d33078b4a97c4eda00fc2323be187696e927a
2012-09-24 00:32:57 -07:00
Daniel Sandler
3ffdcc70c2 Properly launch quicksettings activities.
- As current user
 - Dismissing keyguard if necessary
 - Dismissing all status bar windows and panels

Also move some QS-specific stuff out of PanelView and into
SettingsPanelView.

Bug: 7217006
Change-Id: I4d8ac84cc0f43e78f70553599c3207305c4f5c74
2012-09-24 00:43:51 -04:00
Jim Miller
26c5686b7e Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 2012-09-23 19:03:20 -07:00
Jeff Sharkey
49397ac93c Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 2012-09-23 18:25:47 -07:00
Romain Guy
6b3292ce5b Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 2012-09-23 17:50:06 -07:00
Romain Guy
97dc9172b0 Avoid deadlock when deleting layers
Bug #7217459

Change-Id: I12bfa6c30c5030bd1b23ea6a3ce64240ab1dfba3
2012-09-23 17:49:24 -07:00
Irfan Sheriff
916b2b5a93 Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 2012-09-23 17:32:07 -07:00
Irfan Sheriff
2c2ca5cb7c Increase WFD connect time out to 60s
The worst case WPS timeout for GO negotiation is two minutes.
Until, we better handle cancelling/disconnecting and re-syncing the
WFD framework with the wifi direct framework/supplicant, increase
the time out to 60s to help with dogfood

Bug: 7217600
Change-Id: I1ba0d9963b957454e2c6f47bfdf05176dea07be7
2012-09-23 17:30:19 -07:00
Jim Miller
b499884ba1 Better handling of multiple touch events in GlowPadView
This fixes a bug where a secondary touch event from the edge of the screen
would cause GlowPadView to choose the wrong target.  The issue is resolved
by keeping track of pointer ids and only allowing the one that initiated
the gesture to complete it.

Fixes bug 7133500

Change-Id: If296b60af2421bfa1a9a082e608ba77b2392a218
2012-09-23 17:18:17 -07:00
Fabrice Di Meglio
f7a3e979a7 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:45:51 -07:00
Jeff Sharkey
752cd922f7 Always bind to DefaultContainerService as OWNER.
When PackageManagerService deals with external storage, always bind
to DefaultContainerService as USER_OWNER.  This avoids binding to a
stopped user, which would fail.

Bug: 7203111
Change-Id: I8e303c7558e8b5cbe4fea0acc9a472b598df0caa
2012-09-23 16:44:34 -07:00
Ian Rogers
5325010486 Extra GC heap configuration parameters.
Allows parameters to increase the maximum free size. b/6606849

Change-Id: Ia74ccdbb8e32954820e3bd26f441b2c2fac889f4
2012-09-23 16:38:03 -07:00
Jason Sams
ac4bd00c1f Change 5x5 convolve to better test impl.
bug 7216044

Change-Id: I7165606a3ebf96ea3f401ed14d46f5105ed75ce4
2012-09-23 16:32:32 -07:00
Fabrice Di Meglio
1a7d487380 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedTextAlignment() to getTextAlignment()

Change-Id: I6a2b6c9ec4f5cea1adde46e35d5f3c49880791ee
2012-09-23 16:19:58 -07:00
Fabrice Di Meglio
be4c5dd9d0 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:19:03 -07:00
Stephen Hines
9c7b529125 Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev 2012-09-23 16:13:23 -07:00
Amith Yamasani
5e8cbdc0bd Merge "Fixing services start order that impacts ICS - JB upgrade" 2012-09-23 16:01:53 -07:00
Fabrice Di Meglio
97e146cf02 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedTextDirection() to getTextDirection()

Change-Id: Id2a6025daf5521dcd676e454fc6bb9955fdccf2d
2012-09-23 15:55:11 -07:00
Wink Saville
8a06969d5b Merge "Refactor Cell Location public API." into jb-mr1-dev 2012-09-23 15:44:30 -07:00
Irfan Sheriff
335fff3fc9 Merge "P2p fixes" into jb-mr1-dev 2012-09-23 15:39:19 -07:00
Irfan Sheriff
d36adc31ce P2p fixes
- NPE fixes
- Remove group on CTRL-EVENT-DISCONNECTED since the supplicant sometimes misses
the group removed event
- Fix the pattern match since we sometimes end up creating group without passphrase

Bug: 7119140
Bug: 7210558
Change-Id: I2cf0be073aaaaa9b931ea9a79b0bf4bd6a2b32ff
2012-09-23 15:27:50 -07:00
Fabrice Di Meglio
239e430578 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:09:56 -07:00
Victoria Lease
17e3e9e53c Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev 2012-09-23 15:06:59 -07:00
Fabrice Di Meglio
e3f2ac9e52 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:05:56 -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
Fabrice Di Meglio
e56ffdc7b3 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedLayoutDirection() to getLayoutDirection()

Change-Id: I3afe56c0db0751952f5056c23893cb7455531d29
2012-09-23 14:51:16 -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
Fabrice Di Meglio
4457e85a70 Fix bug #6427629 Clean up layout direction APIs
- canResolveXxx() should be hidden
- resetResolvedXxx() should be hidden
- resolveDrawables(), resolveLayoutDirection(), resolvePadding(), resolveTextAlignment(), resolveTextDirection() should be hidden
- onResolvedXxx() should be merged into one callback
- fix also an issue with setting the layout direction of the drawable in ImageView
- fix also an issue with checking if TextAlignment can be resolved

Change-Id: I1402269ddf8632525f5550f80e5610e1a7b4034d
2012-09-23 14:15:26 -07:00
Victoria Lease
8dbb63419b Allow apps to getProviders() without location permissions.
This restores MR0's behavior in this regard - apps calling
LocationManager.getProviders() or LocationManager.getBestProvider()
will no longer receive a SecurityException if they do not have
any location permissions. Instead, as was the behavior in MR0, they
only receive providers that their permissions grant them access to,
including an empty list if they have no permission whatsoever.

Bug: 7207864
Change-Id: I027df425e258d436c4821c34a25bc46a2a292824
2012-09-23 14:09:47 -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