83375 Commits

Author SHA1 Message Date
Wink Saville
4e9c7e3f60 am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"
* commit '5a60f058891fa5417df7d53be28521b604071fea':
  Telephony: Add ICC_UNKNOWN intent
2012-08-23 15:12:31 -07:00
Dianne Hackborn
513f68bc5a am bfe20d1a: am 8bfba7df: Merge "fix wrong substring"
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring
2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents"
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
  Protecting more views from (bad) MotionEvents
2012-08-23 15:12:21 -07:00
Wink Saville
5a60f05889 am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"
* commit '13ab2c9fdaec119a40b628ae772fd1462fbb826d':
  Telephony: Add ICC_UNKNOWN intent
2012-08-23 15:09:43 -07:00
Dianne Hackborn
bfe20d1aa1 am 8bfba7df: Merge "fix wrong substring"
* commit '8bfba7df376509cc944b80bd1f1715f1ef94b246':
  fix wrong substring
2012-08-23 15:09:39 -07:00
Jean-Baptiste Queru
d86bebb4a9 am 322b0a16: Merge "Protecting more views from (bad) MotionEvents"
* commit '322b0a160d29ddbac35d59655111c8730cadd3e2':
  Protecting more views from (bad) MotionEvents
2012-08-23 15:09:35 -07:00
Irfan Sheriff
2a4aaf133c Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-08-23 14:58:43 -07:00
Katie McCormick
03a429ddcd resolved conflicts for merge of 9447af12 to jb-mr1-dev
Change-Id: I5b5f086dd27a8c567b27fb9a7799b0552a8e0ae4
2012-08-23 14:47:51 -07:00
Jeff Sharkey
2e9aa74127 Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev 2012-08-23 14:44:22 -07:00
Jeff Sharkey
6a25cbdd94 Make USER_PRESENT broadcast per-user.
Bug: 7029707
Change-Id: Ic4671b96525dc2fb4d58ce3fca0a4627598a6cae
2012-08-23 14:43:44 -07:00
Irfan Sheriff
2e5b13ef95 resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp
Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e
2012-08-23 14:37:06 -07:00
Craig Mautner
5642a48fbb Fix unprotected variable access by serializing.
The variables mKeyguardDisabled and mAllowDisableKeyguard were
being modified unprotected by mKeyguardTokenWatcher. Fix is to
serialize accesses to these variables by only referencing them
from the same Handler that mKeyguardTokenWatcher uses. Eliminates
synchronization blocks and mKeyguardDisabled variable.

Fixes bug 7045624.

Change-Id: I6355aa393507408296316bee61e178dc81e2a172
2012-08-23 14:25:34 -07:00
Wink Saville
13ab2c9fda Merge "Telephony: Add ICC_UNKNOWN intent" 2012-08-23 14:25:23 -07:00
Adam Powell
11a03afaad Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 2012-08-23 14:18:22 -07:00
Victoria Lease
865a1756b6 Merge "Set text locale in language settings panel." into jb-mr1-dev 2012-08-23 14:14:38 -07:00
Adam Powell
c3c0e39ab5 Properly respect divider settings for TableLayout
Make sure that TableLayout always knows it's in VERTICAL orientation.

Bug 7041351

Change-Id: I9935891a58e558840ac7956a0ffe8448e21de799
2012-08-23 14:13:10 -07:00
Roman Nurik
1caca0a1f2 am 2b4b1afc: am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '2b4b1afcfa75dc2a3d9436bcde5538a49c56d124':
  Update TabCompat training sample code download.
2012-08-23 14:11:45 -07:00
Jean-Baptiste Queru
013ff81961 am 0a72b3e1: ignore merge of 2e2849a5 to jb-dev-plus-aosp
* commit '0a72b3e12ca96d830ce6639f045d1f4decf9e748':
  Empty DC's apnList when the DC is free.
2012-08-23 14:11:38 -07:00
Dianne Hackborn
8bfba7df37 Merge "fix wrong substring" 2012-08-23 14:10:31 -07:00
Alex Yakavenka
ceb9bbc5df Telephony: Add ICC_UNKNOWN intent
Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
2012-08-23 14:09:51 -07:00
Jean-Baptiste Queru
322b0a160d Merge "Protecting more views from (bad) MotionEvents" 2012-08-23 14:08:40 -07:00
Dianne Hackborn
5d1122a3f8 Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 2012-08-23 14:00:22 -07:00
Dianne Hackborn
f1c26e2fd0 Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action.
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
2012-08-23 13:59:40 -07:00
John Spurlock
156c9cc2bf Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev 2012-08-23 13:34:05 -07:00
John Spurlock
10fb224623 Disable screensavers if below first battery warning level.
Don't activate on sleep if below the threshold, and quit any currently
running dream when the threshold is reached.

Bug:6999949
Change-Id: I961b350d24ee6f95e502228aaa57312b0ffbadc1
2012-08-23 16:23:18 -04:00
Doug Zongker
d8b6fa2931 Merge "pass --locale argument to recovery" into jb-mr1-dev 2012-08-23 13:17:25 -07:00
Stephen Hines
bb121d569c am 7cb7292f: (-s ours) am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '7cb7292f046bb860069a0881fc45753872551079':
  DO NOT MERGE - Fix readback lengths
2012-08-23 12:34:40 -07:00
Justin Ho
fd9619f647 am 3bc03666: am 72404a82: Merge "Update Back softkey icon Bug: 6020915" into jb-dev
* commit '3bc03666ccd322f8ebc0c303dabe920b2ae6944c':
  Update Back softkey icon Bug: 6020915
2012-08-23 12:34:37 -07:00
Irfan Sheriff
b25617e72e am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit '46b29d8dd558c734f058b3806a0b56a2a23b33fd':
  WifiWatchdog: handle exception from ArpPeer
2012-08-23 12:34:19 -07:00
John Spurlock
21b53df7c3 Merge "Add framework support for multiple dreams." into jb-mr1-dev 2012-08-23 10:44:05 -07:00
Amith Yamasani
41d4332ab0 Merge "Handle null cache directory" into jb-mr1-dev 2012-08-23 10:13:42 -07:00
Amith Yamasani
92d570529c Handle null cache directory
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.

Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
2012-08-23 10:07:52 -07:00
Doug Zongker
e33b4007ee pass --locale argument to recovery
When RecoverySystem boots into recovery (to install an update or wipe
data and/or cache), pass the --locale argument with the currently
selected locale.

Change-Id: Ib280330932a402be2011207bff8f05caa9b999cd
2012-08-23 09:52:14 -07:00
Jean-Baptiste Queru
9455f8f266 am 729f810d: am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
* commit '729f810d3bca086cf651aa4e2299594a57d6d543':
  WifiStateMachine: ignore auth-fail event during WPS connection
2012-08-23 09:45:30 -07:00
Jean-Baptiste Queru
729f810d3b am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
* commit '8f7100a03768d2863255024cf0c604cac10c9d5d':
  WifiStateMachine: ignore auth-fail event during WPS connection
2012-08-23 09:43:45 -07:00
Jean-Baptiste Queru
8f7100a037 Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 2012-08-23 09:31:03 -07:00
Craig Mautner
6715d1effa Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 2012-08-23 08:44:53 -07:00
Craig Mautner
b47bbc3d80 Clean up displayId and layerStack usage.
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.

Fixes bug 7038151.

Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
2012-08-23 08:43:54 -07:00
Jean-Baptiste Queru
79f6c5f567 am 1e739c96: am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app"
* commit '1e739c96246ca7f0991bb783452b405ffd57cad7':
  Properly handle quick switch between Home button and Gallery app
2012-08-23 08:41:55 -07:00
Jean-Baptiste Queru
1e739c9624 am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app"
* commit 'a4e34ae82f2ccf037875462809be6e5139807b44':
  Properly handle quick switch between Home button and Gallery app
2012-08-23 08:40:03 -07:00
Jean-Baptiste Queru
a4e34ae82f Merge "Properly handle quick switch between Home button and Gallery app" 2012-08-23 08:04:46 -07:00
Michael Jurka
03f482c34d Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev 2012-08-23 04:57:55 -07:00
Michael Jurka
cb2522c86d Recents: apps scale down to thumbnails now
As a part of this change, Recents is now an
activity.

Known issues:
* Jank: jump-cut as app icon appears suddenly
  after the aniamtion
* Preloading recents is broken on phones without
  soft nav bar and on tablets
* Thumbnail window from animation lingers/flashes
  sometimes

Change-Id: Ie6f991f3c2e1e67f9ed84eb6adba9174ed957248
2012-08-23 04:53:53 -07:00
Johan Rosengren
0dc291eef6 Protecting more views from (bad) MotionEvents
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In 2585e9b there were checks added, this change adds
some more.

Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
2012-08-23 13:46:14 +02:00
Ben Murdoch
5385752829 Make SslErrorHandler ctor public/@hide.
Allow WebViewProvider implementations to subclass SslErrorHandler
but at the same time maintain API compatibility by @hide'ing the
constructor.

Bug: 6238802
Change-Id: I5de268364ed74e59f62439b8612ab682656a7906
2012-08-23 10:19:59 +01:00
Ben Murdoch
ed965a2cd1 Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 2012-08-23 02:17:34 -07:00
Wu-cheng Li
f88320558f Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent.
The intent is used to launch camera when the device is secured
(e.g. with a pin, password, pattern, or face unlock).

bug:5955016
Change-Id: I5470cf7ee9deab9677665ef0566bac88bdfd80c6
2012-08-23 13:57:46 +08:00
Kenny Root
618641f266 Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev 2012-08-22 22:55:21 -07:00
Masanori Ogino
08bab56f68 fix wrong substring
The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.

How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"

Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
2012-08-23 14:06:45 +09:00
Baligh Uddin
12850a93ca Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 20:23:55 -07:00