Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,981 Commits 3 Branches 0 Tags
bfcd162cc2c144101b438eb65a04fcc46cc43ad2
Commit Graph

92981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 bc268b9014

Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
 2013-01-03 17:38:57 -08:00
Elliott Hughes
9aac0c1b35 Merge "fix potential memory leak" 2013-01-03 17:35:57 -08:00
Sungmin Choi
bc268b9014 fix potential memory leak 
use delete before return

Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
 2013-01-04 09:56:18 +09:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Wink Saville
881d5387a3 Merge "frameworks/base: Support for LTE network modes" 2013-01-03 14:49:05 -08:00
Victoria Lease
73e243c4d2 Merge "Fix logging typos in GpsLocationProvider" 2013-01-02 14:15:51 -08:00
Uma Maheswari Ramalingam
ec7f4a6953 frameworks/base: Support for LTE network modes 
Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
 2013-01-02 14:05:58 -08:00
Amith Yamasani
554ed0f034 Merge "Fixed typo in Recreating an Activity documentation" 2013-01-02 09:00:28 -08:00
Elliott Hughes
5cb0f21846 Merge "StringBlock_nativeCreate: Possible Leak" 2012-12-21 17:17:42 -08:00
Gulshan Singh
870d2a2988 Fixed typo in Recreating an Activity documentation 
The word although was spelled as althought. This is now fixed.
Signed-off-by: Gulshan Singh <gsingh2011@gmail.com>

Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
 2012-12-21 17:13:43 -05:00
James Dong
5d5526aa86 Merge "Handle errors from AudioEffect::queryNumberEffects" 2012-12-21 14:05:09 -08:00
James Dong
c8db3b8ae3 Merge "Set "isdrm" info in Mediastore" 2012-12-21 13:34:42 -08:00
Magnus Eriksson
160c1ca117 Fix logging typos in GpsLocationProvider 
Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
 2012-12-21 21:07:28 +01:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
You Kim
218a313bb0 StringBlock_nativeCreate: Possible Leak 
osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
 2012-12-21 06:19:38 +09:00
Victoria Lease
fc56015bd3 Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 2012-12-20 12:09:48 -08:00
Andrew Hsieh
62ec958865 Merge "Fix typo" 2012-12-19 16:10:12 -08:00
Glenn Kasten
ba97ad2a67 Merge "Leak in ToneGenerator_native_setup" 2012-12-19 08:47:20 -08:00
Dmytro Dubovyk
729f6685f9 Setting the default value for dock audio 
There was no default value for parameter "dock_audio_media_enabled"
in global settings and because of that it couldn't be obtained before
Settings app first start and improper actions, such as FORCE_NONE
sending to AudioSystem instead of FORCE_ANALOG_DOCK, were taken.
This patch sets default value to 'true'.

Change-Id: Idbe343519db15f806f3a237e8b39f8420b9edde1
Signed-off-by: Dmytro Dubovyk <dmytro.dubovyk@ti.com>
 2012-12-19 11:14:38 +02:00
Andrew Hsieh
0482291f45 Fix typo 
Change-Id: I58f863c4eb1eb4196d001c280027ab59bee51ce4
 2012-12-19 11:21:38 +08:00
Elliott Hughes
171a990699 Merge "Update the JNI spec link, and remove a dead link." 2012-12-18 18:06:07 -08:00
Elliott Hughes
965da34de9 Update the JNI spec link, and remove a dead link. 
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.

Bug: http://code.google.com/p/android/issues/detail?id=41623
Change-Id: I521b640fdef17c98582171d97214486d16e774e4
 2012-12-18 17:24:36 -08:00
Robert Greenwalt
9b64c4906b Merge "Return error upon attempt to use non-existent APN" 2012-12-18 11:02:52 -08:00
Mikael Hedegren
342a7cb69f Return error upon attempt to use non-existent APN 
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.

Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
 2012-12-18 15:32:48 +01:00
Adam Powell
7979b58a7a Merge "Memory leak due to bad destroy sequence" 2012-12-17 14:39:56 -08:00
Christopher Tate
4b0ed0178d Merge "BackupHelpers: Fix Typo" 2012-12-17 10:39:41 -08:00
Craig Mautner
367921dd87 Merge "Toast: fix force close if called from system service" 2012-12-17 09:05:07 -08:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service 
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
 2012-12-17 18:04:17 +07:00
You Kim
8b2e2c8abc BackupHelpers: Fix Typo 
delete --> free

Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
 2012-12-17 03:36:10 +09:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
zobject
686a805ef9 Fix NullpointException problem in onMenuItemSelected 
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
 2012-12-15 08:23:26 +09:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime. 
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
 2012-12-14 14:29:47 -08:00
Marco Nelissen
01f42639f2 Merge "fix typo in docs" 2012-12-14 09:35:26 -08:00
Elliott Hughes
2eca1b53ae Merge "Add return after NULL check in JetPlayer" 2012-12-14 09:19:45 -08:00