summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-2810-39/+39
| | | | | Bug: 3484927 Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
* Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+9
|\
| * Track libcore API update.Elliott Hughes2013-06-281-0/+9
|/ | | | | Bug: 3484927 Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
* Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+2
|\
| * Track libcore API update.Elliott Hughes2013-06-281-0/+2
|/ | | | | Bug: 3484927 Change-Id: I684d724000d09a52c840076fab5985242c77c908
* Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+12
|\
| * Track libcore API update.Elliott Hughes2013-06-281-0/+12
| | | | | | | | | | Bug: 3484927 Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
* | Merge "Add ALPN support to SSL socket factory"Kenny Root2013-06-272-14/+58
|\ \
| * | Add ALPN support to SSL socket factoryKenny Root2013-06-262-14/+58
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix deadlock of WebViewCoreThread"John Reck2013-06-251-1/+6
|\ \ | |/ |/|
| * Fix deadlock of WebViewCoreThreadYuya Aoki2013-05-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Avoid adding FORWARD_LOCK flag to an updated system app"Christopher Tate2013-06-241-3/+6
|\ \
| * | Avoid adding FORWARD_LOCK flag to an updated system appMasanori Ogino2012-05-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following case: 1. An app exists in /system/app or /vendor/app. (i.e, it's a system app) 2. If the app would be updated as a forward-lock app by downloading from market(google play), then it would be installed in /data/app-private. 3. Moreover, if it would be updated by the whole system image (i.e, FOTA or something like that), then the app would be applied a FORWARD_LOCK flag. The app SHOULD NOT have a FORWARD_LCOK flag. Because the resource path of such app does not refer to the proper resources to access. Change-Id: I0750f69a93a3115f4201029796b598507de3555f
* | | Merge "Lockscreen : Reference correct layout"Jean-Baptiste Queru2013-06-241-1/+1
|\ \ \
| * | | Lockscreen : Reference correct layoutDanesh Mondegarian2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Include correct layout for portrait. Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
* | | | Merge "Fix misspelling of getLteSignalStrenght."Wink Saville2013-06-212-2/+2
|\ \ \ \
| * | | | Fix misspelling of getLteSignalStrenght.Wink Saville2013-06-212-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Change to getLteSignalStrength. Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
* | | | Merge "Avoid unnecessary FindClass("java/lang/String")."Dianne Hackborn2013-06-181-15/+3
|\ \ \ \
| * | | | Avoid unnecessary FindClass("java/lang/String").Vladimir Marko2013-06-171-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use previously retrieved global reference instead. Check for NULL after creating the global reference. Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
* | | | | Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"Elliott Hughes2013-06-1774-80/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correct Date format for el_GR, sv_SE and tr_TR localeshowardb2013-06-1774-80/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "Track nio API change."Elliott Hughes2013-06-141-1/+1
|\ \ \ \
| * | | | Track nio API change.Elliott Hughes2013-06-141-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
* | | | Merge "Update HttpResponseCache to use the new cache API."Narayan Kamath2013-06-131-39/+30
|\ \ \ \
| * | | | Update HttpResponseCache to use the new cache API.Narayan Kamath2013-06-121-39/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new API was introduced in https://android-review.googlesource.com/#/c/59985/ Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
* | | | | Merge "Fix incorrect fragment animation used for hiding fragments"Adam Powell2013-06-071-1/+1
|\ \ \ \ \
| * | | | | Fix incorrect fragment animation used for hiding fragmentsAdam Powell2013-06-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror of support lib patch https://android-review.googlesource.com/#/c/60032/ into frameworks/base. Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
* | | | | Merge "Track libcore changes."Elliott Hughes2013-06-061-6/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Track libcore changes.Elliott Hughes2013-06-061-6/+13
|/ / / / | | | | | | | | | | | | | | | | Bug: 3484927 Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
* | | | Merge "change "next" to "done" in minute IME option under 24-hour format"Elliott Hughes2013-06-051-0/+10
|\ \ \ \
| * | | | change "next" to "done" in minute IME option under 24-hour formatHyejin Kim2013-03-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need "next" button under 24-hour format any more. So, we changed from "next" button to "done" in IME option when setting minute under 24-hour format Change-Id: Ic9b1673248183060ba7279b63648a85dc39ca3b9
* | | | | Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"Wink Saville2013-06-011-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixing crash in PhoneNumberUtils getNumberFromIntentMagnus Karlsson2013-05-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling intent with no data when trying to retrieve number from intent. Change-Id: If7c5930e7048aec732fb7a3fbeb3391e1408b071
* | | | | Merge "framework:base: iterator error in singletone provider"Amith Yamasani2013-05-291-0/+1
|\ \ \ \ \
| * | | | | framework:base: iterator error in singletone providerJun Su2013-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"Andrew Hsieh2013-05-291-12/+12
|\ \ \ \ \ \
| * | | | | | Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_eventAndrew Hsieh2013-05-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See b.android.com/55873 Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
* | | | | | | Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"Jeff Sharkey2013-05-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing ACTION_MEDIA_UNMOUNTED intentChristian Beck2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Bug fix for building the hover target list"Jeff Brown2013-05-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug fix for building the hover target listSangkyu Lee2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lastHoverTarget should be updated even though lastHoverTarget is not null. If not, the hover target list cannot have more than one hover target. Change-Id: I21b49e8cbf3657321b2f1f2c20a3bdeb7f07bd48 Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
* | | | | | | | | Merge "Properly rotate full [-pi, +pi] orientation range if available"Jeff Brown2013-05-281-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Properly rotate full [-pi, +pi] orientation range if availableJason Gerecke2013-03-151-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code currently in place assumes that orientation has a range of [-pi/2, +pi/2] as may be found with a touch digitizer. However, when used with a digitzer that can report the full [-pi, +pi] range of orientations (e.g. a stylus) the calculations here are incorrect. This patch checks if the post-rotation value is out of range for the axis, and wraps it back around. Change-Id: I03a22f7bf9526a5d995df1a18430d6dd24c6d6ee
* | | | | | | | | | Merge "Add additional Method that check whether a table is empty or not"Jeff Brown2013-05-281-0/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Add additional Method that check whether a table is empty or notHyoseong Kim2013-04-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application Devleopers are using queryNumEntries API implemented by "COUNT(*)" to check whether a table is empty or not. COUNT(*) has to process the entire table to compute the result. But, "EXISTS" can stop after a single matching row has been found. So, Using "EXISTS" is more faster than "COUNT(*)" I added new API using "EXISTS" to check whether a table is empty or not Change-Id: Idcc2633d0a5349c59f41e125cf34c9dc6622cdbe
* | | | | | | | | | Merge "Fix wrong log information in DevicePolicyManagerService"Dianne Hackborn2013-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix wrong log information in DevicePolicyManagerServicejoonyoung.cho2013-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user reset password their password, if password doesn't match target quality of device, DPM print a log why can't reset password. however log message isn't correct information. in log context, it have to exist current quality and target quality. this patch can help print correct log. Change-Id: I5c8fb1c77ddbe1bdbc76e35038c897e2e8efb077
* | | | | | | | | | | Merge "Avoid IllegalArgumentException in Preference.java compareTo()"Dianne Hackborn2013-05-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Avoid IllegalArgumentException in Preference.java compareTo()Carsten Hauge2013-04-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Fix CalendarView to show the month title properly."Dianne Hackborn2013-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-04 00:49:17 +0000