95164 Commits

Author SHA1 Message Date
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Robert Greenwalt
1d8c5b5b1d Merge "Update tethering profile for specific operators" 2013-05-24 17:59:03 +00:00
seonju.oh
8645031246 Update tethering profile for specific operators
Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
2013-05-24 10:33:11 -07:00
Geremy Condra
9c759e3968 Merge "Fix SELinux get.. methods aborting on invalid address" 2013-05-22 19:25:37 +00:00
Richard Haines
81ad284517 Fix SELinux get.. methods aborting on invalid address
SELinux get.. JNI need the 'security_context_t tmp' entries set
to NULL, otherwise on error freecon() tries to release uninitialised
memory causing apps to abort with invalid address.
Also fixed getPeerCon ALOGV call as this caused Zyote to abort when
verbose logging set.

Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
2013-05-22 15:12:16 +01:00
Christian Beck
f503c8f377 Add missing ACTION_MEDIA_UNMOUNTED intent
When an SD card is removed without the user unmounting, the intent
ACTION_MEDIA_BAD_REMOVAL is fired but is missing the preceeding
ACTION_MEDIA_UNMOUNTED which is needed to keep UI consistency.

Now when bad media removal is detected an ACTION_MEDIA_UNMOUNTED
intent is sent before the ACTION_MEDIA_BAD_REMOVAL.

Change-Id: I133300f42bafab141351e796d7cfc13c15d133e0
2013-05-20 09:26:32 +02:00
John Huang
8204098659 Merge "Premium SMS popup for ISIS" 2013-05-16 02:31:43 +00:00
Sangcheol Lee
5e6d85fd3b Premium SMS popup for ISIS
Premium SMS popup warning during ISIS Wallet activation must be removed

Change-Id: Ib0bd4b1f2ee37abc8becc64e20ae73337f0381aa
2013-05-15 22:43:37 +00:00
Robert Greenwalt
a34b531bb6 Merge "EthernetDataTracker: Set network available on connected" 2013-05-15 16:39:05 +00:00
Danny Baumann
e7123a6601 Don't include flags in configuration change if their value hasn't changed.
This makes the check in updateFrom() match the logic in diff().

Change-Id: I3ab4e8460f7fbf985ef55b9514a8aa90d401d486
2013-05-15 11:12:42 +02:00
Kenny Root
cdc457bbba Merge "Tracking change to add AEAD functionality" 2013-05-15 00:55:58 +00:00
Kenny Root
e60bcc63e5 Tracking change to add AEAD functionality
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9

Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
2013-05-14 17:54:07 -07:00
Elliott Hughes
b37652a297 Merge "Track libcore API changes." 2013-05-14 18:38:42 +00:00
Elliott Hughes
a377b42109 Track libcore API changes.
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
2013-05-14 10:55:52 -07:00
Conley Owens
d40c41df00 Merge "Track libcore changes." 2013-05-13 21:48:20 +00:00
Elliott Hughes
0d5dee2bc3 Track libcore changes.
Bug: 3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
2013-05-13 14:15:39 -07:00
Elliott Hughes
ebda92b84a Merge "Track libcore cleanup." 2013-05-11 06:51:39 +00:00
Elliott Hughes
4dbfe64675 Track libcore cleanup.
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
2013-05-10 23:47:08 -07:00
Elliott Hughes
37dbac9c40 Merge "Expose @SafeVarargs." 2013-05-11 05:59:14 +00:00
Brian Carlstrom
94f55b30e3 Merge "Tracking libnativehelper dependencies" 2013-05-11 05:34:04 +00:00
Brian Carlstrom
fde1f91d9b Tracking libnativehelper dependencies
Change-Id: I05ec62c43fbe5f8ba23256abac7271ca0b1a7242
2013-05-10 21:16:12 -07:00
Elliott Hughes
40d6715dbb Expose @SafeVarargs.
Bug: 3484927
Change-Id: I8ac70b6a102ebf87c51c76935bd87a21f6c17506
2013-05-10 17:20:38 -07:00
Robert Greenwalt
6f8fb9594f Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 2013-05-10 22:41:10 +00:00
Dmitry Shmidt
00ee47ead4 Merge "framework/base: Handle ASSOC-REJECT events" 2013-05-10 22:35:23 +00:00
Robert Greenwalt
408ad99dd3 Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." 2013-05-10 22:15:27 +00:00
Conley Owens
d702e48c13 Merge "Expose AutoCloseable." 2013-05-10 22:11:46 +00:00
Elliott Hughes
10b802889b Expose AutoCloseable.
Bug: 3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
2013-05-10 14:21:30 -07:00
Craig Mautner
4754f401a9 Merge "Avoid NullPointerException in getHandler()" 2013-05-10 19:50:39 +00:00
Partha N
ee011077df Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Replaced TABs with spaces.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
2013-05-10 07:53:26 -07:00
Deepthi Gowri
c1b631e757 framework/base: Handle ASSOC-REJECT events
Disable current network and enable other saved networks(if any)
once number of ASSOC-REJECTs on an attempt to connect to a corresponding
network exceeds the threshold.

Change-Id: Iac3c1596aa800d93c55b0ac5d8070a058c3842bd
2013-05-09 11:30:26 +05:30
Deepthi Gowri
975b788dab frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Fix for P2P GO beaconing when 4-way Handshake fails by setting
p2p_group_idle timeout of 10 sec when group is started as a GO
and clear it when AP_STA_CONNECTED event is received.

Change-Id: I40189efc31eeb55e01a95a2a8e9c1a95d929952d
bug: 8871100
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2013-05-09 00:15:33 +00:00
Kenny Root
cd1de3940d Merge "Track change in NativeCrypto" 2013-05-06 22:02:20 +00:00
Kenny Root
4b30e3391b Track change in NativeCrypto
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
2013-05-06 15:00:58 -07:00
Elliott Hughes
601afaef52 Merge "Someone's IDE chose the wrong Date." 2013-05-06 20:29:09 +00:00
Elliott Hughes
c00df6d52e Someone's IDE chose the wrong Date.
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.

Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
2013-05-06 10:53:28 -07:00
Magnus Karlsson
2227067d99 Fixing crash in PhoneNumberUtils getNumberFromIntent
Handling intent with no data when trying to retrieve number from
intent.

Change-Id: If7c5930e7048aec732fb7a3fbeb3391e1408b071
2013-05-02 09:59:29 +02:00
Elliott Hughes
6d82f86fa0 Merge "Show CJK dates as all-numeric in the DatePicker." 2013-05-01 21:12:38 +00:00
Elliott Hughes
949e9df25b Show CJK dates as all-numeric in the DatePicker.
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.

Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
2013-05-01 14:12:05 -07:00
Koji Fukui
c6031ab7c8 Avoid NullPointerException in getHandler()
mAttachInfo may be set to null by other threads while running
getHandler().

This fix assigns mAttachInfo to a local variable. Checking null pointer
and getting a member variable are executed through the local variable.
This local variable is constant. So NullPointerException doesn't occur
even if mAttachInfo is set to null while running getHandler().

Change-Id: I4013dfb7951bd864628868ed58f8c4f5b7cbd1d3
2013-05-01 17:20:25 +09:00
Yuya Aoki
dae43b16a7 Fix deadlock of WebViewCoreThread
There was a deadlock in destroy process.
Investigation showed that WebViewCoreThread is waiting some
callbacks but in this case WebViewCoreThread can not resume
itself not to call notify method.

Flow:
1. CallbackProxy.sendMessageToUiThreadSync
2. WebViewClassic.destroy()
3. CallbackProxy.blockMessages()
4. CallbackProxy.handleMessage is called via MainThread
5. The WebViewCoreThread deadlock is occured.

The cases we have to call notify method are followings.
OVERRIDE_URL
CREATE_WINDOW
SAVE_PASSWORD
NOTIFY
OPEN_FILE_CHOOSER
JS_ALERT
JS_CONFIRM
JS_PROMPT
JS_UNLOAD
JS_TIMEOUT

Change-Id: I9d95ae500bf6338d77b32b5fa15de7cff5720d0f
2013-05-01 14:56:22 +09:00
Dmitry Shmidt
ddf7a0660c Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp" 2013-04-30 20:59:11 +00:00
sunil duttu
aff3bd69d3 framework:When turn off of SoftAp immediately call turning ON SoftAp
Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
2013-04-30 13:56:17 -07:00
Elliott Hughes
e3f2735fcf Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 2013-04-30 20:11:50 +00:00
Romain Guy
6628ee7a46 Merge "HeaderViewListAdapter: Correct thrown error names." 2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6 HeaderViewListAdapter: Correct thrown error names.
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.

Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
2013-04-30 12:04:52 -07:00
Elliott Hughes
afe5681051 Merge "Fix DatePicker's spinner order in various locales." 2013-04-30 18:40:01 +00:00
Elliott Hughes
0bb4c701ba Merge "Use ICU for getDateFormatOrder." 2013-04-30 18:22:18 +00:00