OSDN Git Service
John Reck [Tue, 25 Jun 2013 22:28:02 +0000 (22:28 +0000)]
Merge "Fix deadlock of WebViewCoreThread"
Christopher Tate [Mon, 24 Jun 2013 23:02:00 +0000 (23:02 +0000)]
Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
Jean-Baptiste Queru [Mon, 24 Jun 2013 21:15:45 +0000 (21:15 +0000)]
Merge "Lockscreen : Reference correct layout"
Danesh Mondegarian [Mon, 24 Jun 2013 20:00:35 +0000 (16:00 -0400)]
Lockscreen : Reference correct layout
Include correct layout for portrait.
Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
Wink Saville [Fri, 21 Jun 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Fix misspelling of getLteSignalStrenght."
Wink Saville [Fri, 21 Jun 2013 16:58:11 +0000 (09:58 -0700)]
Fix misspelling of getLteSignalStrenght.
Change to getLteSignalStrength.
Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
Dianne Hackborn [Tue, 18 Jun 2013 01:14:37 +0000 (01:14 +0000)]
Merge "Avoid unnecessary FindClass("java/lang/String")."
Elliott Hughes [Mon, 17 Jun 2013 20:36:53 +0000 (20:36 +0000)]
Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"
howardb [Sun, 16 Jun 2013 13:16:53 +0000 (14:16 +0100)]
Correct Date format for el_GR, sv_SE and tr_TR locales
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.
No CTS tests are added as they require changing the locale which
is not currently possible.
Bug: https://code.google.com/p/android/issues/detail?id=56385
Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
Vladimir Marko [Mon, 17 Jun 2013 11:46:22 +0000 (12:46 +0100)]
Avoid unnecessary FindClass("java/lang/String").
Use previously retrieved global reference instead.
Check for NULL after creating the global reference.
Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
Elliott Hughes [Fri, 14 Jun 2013 23:18:35 +0000 (23:18 +0000)]
Merge "Track nio API change."
Elliott Hughes [Fri, 14 Jun 2013 22:41:26 +0000 (15:41 -0700)]
Track nio API change.
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
Narayan Kamath [Thu, 13 Jun 2013 09:26:33 +0000 (09:26 +0000)]
Merge "Update HttpResponseCache to use the new cache API."
Narayan Kamath [Thu, 6 Jun 2013 11:16:40 +0000 (12:16 +0100)]
Update HttpResponseCache to use the new cache API.
The new API was introduced in
https://android-review.googlesource.com/#/c/59985/
Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
Adam Powell [Fri, 7 Jun 2013 18:46:18 +0000 (18:46 +0000)]
Merge "Fix incorrect fragment animation used for hiding fragments"
Adam Powell [Fri, 7 Jun 2013 17:16:08 +0000 (10:16 -0700)]
Fix incorrect fragment animation used for hiding fragments
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.
Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
Elliott Hughes [Thu, 6 Jun 2013 20:51:30 +0000 (20:51 +0000)]
Merge "Track libcore changes."
Elliott Hughes [Thu, 6 Jun 2013 20:40:21 +0000 (13:40 -0700)]
Track libcore changes.
Bug:
3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
Elliott Hughes [Wed, 5 Jun 2013 23:20:37 +0000 (23:20 +0000)]
Merge "change "next" to "done" in minute IME option under 24-hour format"
Wink Saville [Sat, 1 Jun 2013 14:09:53 +0000 (14:09 +0000)]
Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
Amith Yamasani [Wed, 29 May 2013 22:04:01 +0000 (22:04 +0000)]
Merge "framework:base: iterator error in singletone provider"
Jun Su [Tue, 21 May 2013 09:24:32 +0000 (17:24 +0800)]
framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.
Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
Andrew Hsieh [Wed, 29 May 2013 00:06:54 +0000 (00:06 +0000)]
Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
Jeff Sharkey [Tue, 28 May 2013 20:44:46 +0000 (20:44 +0000)]
Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
Jeff Brown [Tue, 28 May 2013 20:04:23 +0000 (20:04 +0000)]
Merge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 19:56:19 +0000 (19:56 +0000)]
Merge "Properly rotate full [-pi, +pi] orientation range if available"
Jeff Brown [Tue, 28 May 2013 19:55:25 +0000 (19:55 +0000)]
Merge "Add additional Method that check whether a table is empty or not"
Andrew Hsieh [Mon, 27 May 2013 04:27:10 +0000 (12:27 +0800)]
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873
Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
Dianne Hackborn [Sun, 26 May 2013 07:22:21 +0000 (07:22 +0000)]
Merge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 06:59:29 +0000 (06:59 +0000)]
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
Dianne Hackborn [Sun, 26 May 2013 06:58:14 +0000 (06:58 +0000)]
Merge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 06:57:04 +0000 (06:57 +0000)]
Merge "Don't include flags in configuration change if their value hasn't changed."
Dianne Hackborn [Sun, 26 May 2013 06:56:03 +0000 (06:56 +0000)]
Merge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 06:30:26 +0000 (06:30 +0000)]
Merge "Framework/base: Added synchronization block to avoid race condition"
Robert Greenwalt [Fri, 24 May 2013 17:59:02 +0000 (17:59 +0000)]
Merge "Update tethering profile for specific operators"
seonju.oh [Fri, 24 May 2013 06:46:34 +0000 (15:46 +0900)]
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>
Geremy Condra [Wed, 22 May 2013 19:25:37 +0000 (19:25 +0000)]
Merge "Fix SELinux get.. methods aborting on invalid address"
Richard Haines [Wed, 22 May 2013 14:12:16 +0000 (15:12 +0100)]
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>
Christian Beck [Mon, 20 May 2013 06:42:45 +0000 (08:42 +0200)]
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
John Huang [Thu, 16 May 2013 02:31:43 +0000 (02:31 +0000)]
Merge "Premium SMS popup for ISIS"
Sangcheol Lee [Fri, 26 Apr 2013 07:03:24 +0000 (16:03 +0900)]
Premium SMS popup for ISIS
Premium SMS popup warning during ISIS Wallet activation must be removed
Change-Id: Ib0bd4b1f2ee37abc8becc64e20ae73337f0381aa
Robert Greenwalt [Wed, 15 May 2013 16:39:05 +0000 (16:39 +0000)]
Merge "EthernetDataTracker: Set network available on connected"
Danny Baumann [Wed, 15 May 2013 08:21:40 +0000 (10:21 +0200)]
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
Kenny Root [Wed, 15 May 2013 00:55:58 +0000 (00:55 +0000)]
Merge "Tracking change to add AEAD functionality"
Kenny Root [Tue, 14 May 2013 23:10:51 +0000 (16:10 -0700)]
Tracking change to add AEAD functionality
This tracks libcore change
d416195acbc08f2b3bdd5d5532d40438465d99e9
Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
Elliott Hughes [Tue, 14 May 2013 18:38:41 +0000 (18:38 +0000)]
Merge "Track libcore API changes."
Elliott Hughes [Tue, 14 May 2013 17:55:52 +0000 (10:55 -0700)]
Track libcore API changes.
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
Conley Owens [Mon, 13 May 2013 21:48:20 +0000 (21:48 +0000)]
Merge "Track libcore changes."
Elliott Hughes [Mon, 13 May 2013 21:15:39 +0000 (14:15 -0700)]
Track libcore changes.
Bug:
3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
Elliott Hughes [Sat, 11 May 2013 06:51:39 +0000 (06:51 +0000)]
Merge "Track libcore cleanup."
Elliott Hughes [Sat, 11 May 2013 06:47:08 +0000 (23:47 -0700)]
Track libcore cleanup.
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
Elliott Hughes [Sat, 11 May 2013 05:59:14 +0000 (05:59 +0000)]
Merge "Expose @SafeVarargs."
Brian Carlstrom [Sat, 11 May 2013 05:34:04 +0000 (05:34 +0000)]
Merge "Tracking libnativehelper dependencies"
Brian Carlstrom [Sat, 11 May 2013 03:09:51 +0000 (20:09 -0700)]
Tracking libnativehelper dependencies
Change-Id: I05ec62c43fbe5f8ba23256abac7271ca0b1a7242
Elliott Hughes [Sat, 11 May 2013 00:20:38 +0000 (17:20 -0700)]
Expose @SafeVarargs.
Bug:
3484927
Change-Id: I8ac70b6a102ebf87c51c76935bd87a21f6c17506
Robert Greenwalt [Fri, 10 May 2013 22:41:10 +0000 (22:41 +0000)]
Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"
Dmitry Shmidt [Fri, 10 May 2013 22:35:23 +0000 (22:35 +0000)]
Merge "framework/base: Handle ASSOC-REJECT events"
Robert Greenwalt [Fri, 10 May 2013 22:15:27 +0000 (22:15 +0000)]
Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
Conley Owens [Fri, 10 May 2013 22:11:46 +0000 (22:11 +0000)]
Merge "Expose AutoCloseable."
Elliott Hughes [Fri, 10 May 2013 21:21:30 +0000 (14:21 -0700)]
Expose AutoCloseable.
Bug:
3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
Craig Mautner [Fri, 10 May 2013 19:50:39 +0000 (19:50 +0000)]
Merge "Avoid NullPointerException in getHandler()"
Partha N [Tue, 7 May 2013 03:20:47 +0000 (20:20 -0700)]
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>
Deepthi Gowri [Tue, 30 Apr 2013 12:53:57 +0000 (18:23 +0530)]
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
Deepthi Gowri [Wed, 6 Mar 2013 10:52:46 +0000 (16:22 +0530)]
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>
Kenny Root [Mon, 6 May 2013 22:02:20 +0000 (22:02 +0000)]
Merge "Track change in NativeCrypto"
Kenny Root [Mon, 6 May 2013 22:00:58 +0000 (15:00 -0700)]
Track change in NativeCrypto
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
Elliott Hughes [Mon, 6 May 2013 20:29:09 +0000 (20:29 +0000)]
Merge "Someone's IDE chose the wrong Date."
Elliott Hughes [Mon, 6 May 2013 17:53:28 +0000 (10:53 -0700)]
Someone's IDE chose the wrong Date.
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.
Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
Magnus Karlsson [Wed, 6 Feb 2013 10:49:24 +0000 (11:49 +0100)]
Fixing crash in PhoneNumberUtils getNumberFromIntent
Handling intent with no data when trying to retrieve number from
intent.
Change-Id: If7c5930e7048aec732fb7a3fbeb3391e1408b071
Elliott Hughes [Wed, 1 May 2013 21:12:38 +0000 (21:12 +0000)]
Merge "Show CJK dates as all-numeric in the DatePicker."
Elliott Hughes [Tue, 30 Apr 2013 20:41:06 +0000 (13:41 -0700)]
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
Koji Fukui [Mon, 1 Apr 2013 05:37:01 +0000 (14:37 +0900)]
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
Yuya Aoki [Thu, 14 Mar 2013 09:02:22 +0000 (18:02 +0900)]
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
Dmitry Shmidt [Tue, 30 Apr 2013 20:59:10 +0000 (20:59 +0000)]
Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
sunil duttu [Wed, 6 Mar 2013 04:33:20 +0000 (10:03 +0530)]
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
Elliott Hughes [Tue, 30 Apr 2013 20:11:49 +0000 (20:11 +0000)]
Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
Romain Guy [Tue, 30 Apr 2013 19:11:22 +0000 (19:11 +0000)]
Merge "HeaderViewListAdapter: Correct thrown error names."
Taylor H. Perkins [Tue, 30 Apr 2013 19:04:52 +0000 (12:04 -0700)]
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>
Elliott Hughes [Tue, 30 Apr 2013 18:40:01 +0000 (18:40 +0000)]
Merge "Fix DatePicker's spinner order in various locales."
Elliott Hughes [Tue, 30 Apr 2013 18:22:18 +0000 (18:22 +0000)]
Merge "Use ICU for getDateFormatOrder."
Elliott Hughes [Tue, 30 Apr 2013 18:11:53 +0000 (11:11 -0700)]
Fix DatePicker's spinner order in various locales.
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).
Bug:
7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
Elliott Hughes [Tue, 30 Apr 2013 18:09:53 +0000 (11:09 -0700)]
Use ICU for getDateFormatOrder.
Bug:
7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
Kenny Root [Tue, 30 Apr 2013 04:02:01 +0000 (04:02 +0000)]
Merge "Track change to JSSE provider"
John Reck [Tue, 30 Apr 2013 01:21:30 +0000 (01:21 +0000)]
Merge "Revert "Can not mark the same content of browser page after copy""
John Reck [Tue, 30 Apr 2013 01:17:15 +0000 (01:17 +0000)]
Revert "Can not mark the same content of browser page after copy"
This reverts commit
2b3cef0dd74cb9470e5387b015ee7a13af1fff7b
Causes crashes in Email, reverting for now
Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c
Kenny Root [Wed, 24 Apr 2013 05:34:24 +0000 (22:34 -0700)]
Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
Michael Wright [Mon, 29 Apr 2013 22:05:43 +0000 (22:05 +0000)]
Merge "input: added support for multiple keyevents"
Diego Torres Milano [Thu, 4 Apr 2013 17:44:34 +0000 (13:44 -0400)]
input: added support for multiple keyevents
- Multiple keyevents can now be send from the command line:
input keyevent <key code number or name> ...
Sometimes invoking 'input' repeatedly does not send the events fast
enough, this change solves the problem by allowing multiple key code
number or names be added to the command line.
Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737
Christopher Tate [Mon, 29 Apr 2013 21:34:28 +0000 (21:34 +0000)]
Merge "Document the 'aapt dump strings' command"
Kenny Root [Mon, 29 Apr 2013 20:54:48 +0000 (20:54 +0000)]
Merge "Don't use X509CertImpl directly"
Kenny Root [Wed, 24 Apr 2013 05:33:18 +0000 (22:33 -0700)]
Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
Carsten Hauge [Mon, 4 Feb 2013 13:45:20 +0000 (14:45 +0100)]
Avoid IllegalArgumentException in Preference.java compareTo()
In some situations the collection.sort() algoritm fails in compareTo()
with a: java.lang.IllegalArgumentException: Comparison method violates
its general contract!, due to a more strict validation of the compare
contract.
This strict validation was introduced in java 1.7.
See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=
6804124
This fix should prevent the sorting from crashing.
Change-Id: I64230e7f62f83c99d7a6274964bb2988ae843826
Mårten Kongstad [Thu, 20 Dec 2012 09:08:54 +0000 (10:08 +0100)]
Document the 'aapt dump strings' command
Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.
Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
Elliott Hughes [Fri, 26 Apr 2013 18:41:47 +0000 (18:41 +0000)]
Merge "Use the newer ZoneInfoDB API."
Elliott Hughes [Fri, 26 Apr 2013 18:30:54 +0000 (11:30 -0700)]
Use the newer ZoneInfoDB API.
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
Victoria Lease [Fri, 26 Apr 2013 17:17:39 +0000 (17:17 +0000)]
Merge "Can not mark the same content of browser page after copy"
Alex Klyubin [Wed, 24 Apr 2013 05:54:46 +0000 (05:54 +0000)]
Merge "Human-readable POSIX capabilities for SystemServer."
Nick Kralevich [Tue, 23 Apr 2013 23:33:52 +0000 (23:33 +0000)]
Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"
Nick Kralevich [Tue, 23 Apr 2013 22:30:45 +0000 (15:30 -0700)]
Don't set ADDR_COMPAT_LAYOUT on the emulator
Don't work around third party app bugs on the emulator.
Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
Ian Rogers [Tue, 23 Apr 2013 15:13:04 +0000 (15:13 +0000)]
Merge "Adding matching @deprecated."