93016 Commits

Author SHA1 Message Date
Kenny Root
133c5f5e91 Merge "AndroidKeyStore: fix tests" 2013-02-04 23:01:01 +00:00
Kenny Root
8b58c52bf4 AndroidKeyStore: fix tests
Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d
2013-02-04 14:52:23 -08:00
Kenny Root
ace72f6a37 Merge "Function uri.getAuthority is called twice. Minor doc corrections." 2013-02-04 19:21:26 +00:00
Irfan Sheriff
43a601e769 Merge "Change default intent" 2013-02-04 18:09:27 +00:00
Irfan Sheriff
c4e9e753f4 Change default intent
Older JB releases have a bug handling persistence invocation. One work
around right now is to have the newer release (with persistence)
use  a lower intent value to allow older release to operate in group
owner mode.

Change-Id: I7ffb66081a352929a6f421e5d6141f592be7d472
2013-02-04 09:37:07 -08:00
Yury Zhauniarovich
f9c5176a51 Function uri.getAuthority is called twice. Minor doc corrections.
Function uri.getAuthority was called twice in methods acquireProvider
and acquireExistingProvider was called twice although a parameter
representing the value had existed. The second call to the function is
changed to the parameter. The parameter's modifier changed to final.
Minor corrections in function descriptions in the file.

Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
Change-Id: Id003aa38c17d644357873c41a8f5ec455e46a4b7
2013-02-03 16:14:11 +00:00
Kenny Root
7ad885e2e6 Merge "One more fix for incorrect indices." 2013-01-30 05:54:03 +00:00
Amith Yamasani
abcb9b96f8 Merge "Added focusable true on search_button for D-pad." 2013-01-28 18:46:38 +00:00
Adam Powell
e305e5f68d Merge "show SELECT ALL icon with text in landscape mode" 2013-01-28 18:44:10 +00:00
Amith Yamasani
3cfca67b0f Merge "Fix possible integer overflow in MtpStorage" 2013-01-28 18:09:59 +00:00
Irfan Sheriff
169dc398ed Merge "Remove config_wifi_p2p_support from config.xml." 2013-01-28 16:01:43 +00:00
Kenny Root
ebb61ca2ed Merge "Track libcore changes for OpenSSLKey" 2013-01-26 00:26:01 +00:00
Kenny Root
bf043b505c Merge "Add TLS Channel ID support to SSLCertificateSocketFactory." 2013-01-25 22:08:52 +00:00
Sungmin Choi
f036920669 show SELECT ALL icon with text in landscape mode
Though set config_allowActionMenuItemTextWithIcon as true,
icon for the "SELECT ALL" menu on ActionBar is not shown as staring
in landscape mode.
To fix it, use "SELECT ALL" icon in onCreateActionMode() to show the
icon and text together.

To show or hide text is decided by updateTextButtonVisibility() of
core/java/com/android/internal/view/menu/ActionMenuItemView.java

STEPS TO REPRODUCE: (please be specific)
1. launch Browser/Chrome and go to google.com
2. rotate to landscape mode
3. long press on URL address

Bug: 8073761
Change-Id: Ie0e0aa45f0dff609ed8c03e4423b163bad5452ed
2013-01-25 22:06:55 +09:00
Yoshihiko Ikenaga
8879343c26 Remove config_wifi_p2p_support from config.xml.
"config_wifi_p2p_support" is no longer used.
It was replaced with PackageManager.FEATURE_WIFI_DIRECT.

Change-Id: Ib57c5246b2ad218e65b4cbbb77fd37c04b5d9682
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-25 11:35:33 +09:00
Irfan Sheriff
381fb8bdd1 Merge "Fix WPS configuration method of BSS enrollee." 2013-01-24 17:38:51 +00:00
Yoshihiko Ikenaga
1201dd9b70 Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.

Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-24 13:48:58 +09:00
Ki-Hwan Lee
6855733b7f Added focusable true on search_button for D-pad.
To give focus to search_button on ActionBar by using D-pad,
the search_button should be set focusable true.

How to reproduce:
(1) Open "API Demos" application -> App -> Action Bar -> Action Bar Usage
(2) Try to focus the Search View, using the D-pad.

Change-Id: Idc0b8e8d88391c152e0fc20467c23d03ab558f62
2013-01-24 13:15:30 +09:00
Wink Saville
1842f2ed74 Merge "frameworks: Display missing text on SimUnlockScreen" 2013-01-24 00:39:38 +00:00
Wink Saville
d84d289f44 Merge "Telephony: Consider EVDO ecio zero value as valid." 2013-01-23 17:15:59 +00:00
Stephen Hines
3983754bbb One more fix for incorrect indices.
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
2013-01-22 18:29:41 -08:00
Christopher Tate
b5a7204313 Merge "Fix array index oob in Matrix3f.loadRotate()." 2013-01-23 01:49:59 +00:00
Stephen Hines
0ce7cdaffd Fix array index oob in Matrix3f.loadRotate().
https://code.google.com/p/android/issues/detail?id=42860

Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
2013-01-22 16:01:44 -08:00
Kenny Root
cc1fc6b6ad Track libcore changes for OpenSSLKey
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
2013-01-22 15:22:56 -08:00
Elliott Hughes
b63e39a076 Merge "fix typo for symbol" 2013-01-22 23:19:20 +00:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory.
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
2013-01-18 12:50:39 -08:00
Elliott Hughes
b1e16f11ff Merge "Track a typo fix in hidden libcore API." 2013-01-17 18:19:49 +00:00
Elliott Hughes
26df61683a Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
2013-01-17 09:24:47 -08:00
Sungmin Choi
05a96d11dd fix typo for symbol
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
2013-01-17 10:25:40 +09:00
Stefan Wysocki
1c15b8d896 Fix for truncated sentence in "Find on Page" field
When typing a text in find on page, then deleting it again the
default text in the field "Find on Page" is truncated by
an invisible view.

This commit fixes the problem by setting the visibility of
mMatches view changes to View.GONE instead of View.INVISIBLE.

Change-Id: I9889f22a254cdabb0cbaba72bff4b14158e5c9ff
2013-01-15 14:02:53 +01:00
Elliott Hughes
727adb8b47 Merge "Manual fix for some Norwegian format strings." 2013-01-14 18:06:27 -08:00
Elliott Hughes
bfcd162cc2 Manual fix for some Norwegian format strings.
Fixing these properly (by removing these donottranslate-cldr.xml files
completely) is blocked on icu4c, so manually fix a few strings in the
meantime.

Bug: http://code.google.com/p/android/issues/detail?id=21859
Change-Id: If91ec70ad4c9e0944deee1cb55382e94ac1b7278
2013-01-14 17:48:30 -08:00
Elliott Hughes
cbfece8237 Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 2013-01-14 17:01:52 -08:00
Elliott Hughes
4caba61ea0 Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
I removed the duplication in DateTimeView rather than fix that copy
of the code.

Bug: 7924970
Change-Id: I60c205d06ad3b50fd2f5d5fc432e4eb186f9c0e7
2013-01-14 15:48:27 -08:00
Christopher Tate
c80746125e Merge "Fix the spelling of "retrieves"" 2013-01-14 10:47:07 -08:00
Scott Kennedy
13b8449515 Fix the spelling of "retrieves"
Change-Id: I33360c573a6ca7b88d0cac834caad547d66b0b2a
2013-01-11 21:50:31 -08:00
Christopher Tate
a3e7919932 Merge "TIME_TICK was not occurred for one hour" 2013-01-10 17:39:33 -08:00
Sungmin Choi
563914a9a1 TIME_TICK was not occurred for one hour
TIME_TICK was not occurred at the end of DST for one hour

Step to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time and Automatic time zone
3. select Time zone -> select Brussels
4. set date -> Oct. 28. 2012
5. set time -> 1:59 AM

Bug: 7922117
Change-Id: I2e78bd97b508d6a38471425cfbaca45fb4b89c1e
2013-01-10 17:33:26 +09:00
Henrik Engström
6393b07134 Fix possible integer overflow in MtpStorage
When converting the MB value MtpReserveSpace value to bytes there is a
possible integer overflow since 3 integer values are multiplied, even
though the result is stored in a long variable. This would be visible when
the value is more than 2 GB. This is solved by making the constants
longs instead of ints.

Change-Id: I799129f7076a6e331cece17b5c05aed210499648
2013-01-09 09:27:59 +01:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
b2d3904b0d Merge "Setting the default value for dock audio" 2013-01-07 12:17:25 -08:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Brian Carlstrom
537fb0afe2 Merge "Use most specific attributes for distinguished name display" 2013-01-04 15:40:35 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
2013-01-04 15:27:24 -08:00
suyi Yuan
be7af83829 Correcting typo in doc of MEDIA_XXX intents
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.

Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
2013-01-04 21:21:59 +08:00
Roger Chen
1740ada533 Handle nested folder case
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-03 18:39:34 -08:00
Elliott Hughes
d13b23a436 Merge "Revert "fix potential memory leak"" 2013-01-03 17:40:55 -08:00
Elliott Hughes
957efcdc73 Revert "fix potential memory leak"
This reverts commit bc268b9014f211910e412a7fda96b6394ff2badc

Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
2013-01-03 17:38:57 -08:00