OSDN Git Service
Elliott Hughes [Wed, 10 Jul 2013 00:48:11 +0000 (17:48 -0700)]
Fix build.
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
Elliott Hughes [Tue, 9 Jul 2013 22:08:36 +0000 (22:08 +0000)]
Merge "Track libcore API change."
Elliott Hughes [Tue, 9 Jul 2013 21:46:18 +0000 (14:46 -0700)]
Track libcore API change.
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:37:50 +0000 (21:37 +0000)]
Merge "Empty commit"
Jean-Baptiste Queru [Tue, 9 Jul 2013 21:34:06 +0000 (14:34 -0700)]
Empty commit
Work around a Gerrit issue.
Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
Jean-Baptiste Queru [Mon, 8 Jul 2013 21:24:06 +0000 (21:24 +0000)]
Merge "FastScroller: Fix to use appropriate index"
Jean-Baptiste Queru [Mon, 8 Jul 2013 21:22:37 +0000 (21:22 +0000)]
Merge "Fixing missing internal link in document."
Jean-Baptiste Queru [Mon, 8 Jul 2013 21:22:18 +0000 (21:22 +0000)]
Merge "Fix typo in AlertController.java"
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:31:35 +0000 (20:31 +0000)]
Merge "Add Colemak keyboard layout"
Christopher Eby [Mon, 19 Nov 2012 04:43:40 +0000 (22:43 -0600)]
Add Colemak keyboard layout
Change-Id: I203b92e56522bc7b3014195d5d83dc1fdb3cab15
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:35:36 +0000 (19:35 +0000)]
Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters"
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:01:25 +0000 (19:01 +0000)]
Merge "Set foreground priority for shutdown receivers."
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:18:13 +0000 (18:18 +0000)]
Merge "The order of child windows is switched"
takeda.masayuki [Wed, 12 Dec 2012 02:06:24 +0000 (11:06 +0900)]
The order of child windows is switched
By calling WindowManagerService#reAddWindowLocked(), the window object
in DisplayContent.mWindows is rearranged. If this window has children,
the window objects belonging to WindowState.mChildWindows are also
rearranged together. At this time, while DisplayContent.mWindows is
arranged in ascending order of Z-Order, WindowState.mChildWindows is
arranged in descending order. Therefore, if children
(= WindowState.mChildWindows) are added to DisplayContent.mWindows
in the original order, the order of children is switched. I think
that children must be sorted before they are added.
Change-Id: I28a506f17fcd99c801a3faa17cca66fffb291596
Jean-Baptiste Queru [Mon, 8 Jul 2013 17:51:23 +0000 (17:51 +0000)]
Merge "Mixed delete/delete[]."
Elliott Hughes [Mon, 8 Jul 2013 16:58:47 +0000 (16:58 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Mon, 8 Jul 2013 16:41:06 +0000 (09:41 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: Icd8a45d33efd205a5eb21ac6a4fcf781f8b5e064
msg555 [Wed, 3 Jul 2013 23:26:23 +0000 (19:26 -0400)]
Mixed delete/delete[].
Error found via valgrind.
Jean-Baptiste Queru [Tue, 2 Jul 2013 21:56:09 +0000 (21:56 +0000)]
Merge "Fixed incorrect calculation of dirty invalidation area"
Elliott Hughes [Mon, 1 Jul 2013 23:40:18 +0000 (23:40 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Mon, 1 Jul 2013 23:39:34 +0000 (16:39 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
Elliott Hughes [Mon, 1 Jul 2013 23:20:09 +0000 (23:20 +0000)]
Merge "Track libcore API update."
Wink Saville [Mon, 1 Jul 2013 22:56:08 +0000 (22:56 +0000)]
Merge "Do not set the network mode differently for LTE+CDMA"
Elliott Hughes [Mon, 1 Jul 2013 21:46:31 +0000 (14:46 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
Naveen Kalla [Sat, 14 Jul 2012 03:10:22 +0000 (20:10 -0700)]
Do not set the network mode differently for LTE+CDMA
ro.telephony.default_network can be set if needed to set a different
value for LTE+CDMA. No need to hardcode preferred network mode in the source code.
Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117
Johan Viktorsson [Wed, 21 Nov 2012 13:17:14 +0000 (14:17 +0100)]
Fixed incorrect calculation of dirty invalidation area
Padding was already taken into consideration before calling
invalidateDrawable in ProgressBar.
Change-Id: Id7f23bd15bb19e2294c07adb2acb397100ea97e8
Elliott Hughes [Sat, 29 Jun 2013 01:08:24 +0000 (01:08 +0000)]
Merge "Track libcore API change."
Elliott Hughes [Sat, 29 Jun 2013 01:03:46 +0000 (18:03 -0700)]
Track libcore API change.
Bug:
3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
Elliott Hughes [Fri, 28 Jun 2013 23:31:35 +0000 (23:31 +0000)]
Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets."
Elliott Hughes [Fri, 28 Jun 2013 23:24:48 +0000 (16:24 -0700)]
Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug:
3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
Elliott Hughes [Fri, 28 Jun 2013 23:17:20 +0000 (23:17 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Fri, 28 Jun 2013 23:08:02 +0000 (16:08 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
Elliott Hughes [Fri, 28 Jun 2013 22:56:03 +0000 (22:56 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Fri, 28 Jun 2013 22:28:00 +0000 (15:28 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
Elliott Hughes [Fri, 28 Jun 2013 20:04:29 +0000 (20:04 +0000)]
Merge "Track libcore API update."
Elliott Hughes [Fri, 28 Jun 2013 17:55:14 +0000 (10:55 -0700)]
Track libcore API update.
Bug:
3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
Kenny Root [Thu, 27 Jun 2013 21:25:24 +0000 (21:25 +0000)]
Merge "Add ALPN support to SSL socket factory"
Kenny Root [Tue, 25 Jun 2013 19:00:34 +0000 (12:00 -0700)]
Add ALPN support to SSL socket factory
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).
Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
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>