drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,872 Commits 1 Branch 0 Tags
Commit Graph

83872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
ec97b4ddb4 LocaleSpan makes Han disambiguation easy! 
I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668
 2012-08-17 16:12:46 -07:00
Amith Yamasani
386f37f6b2 am 2bb9b562: am 81c304b9: Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev 
* commit '2bb9b5620bfa02dbe6d611c1e0acb1d1849cc384':
  Send USER_SWITCHED with the correct permission
 2012-08-17 14:03:19 -07:00
Amith Yamasani
2bb9b5620b am 81c304b9: Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev 
* commit '81c304b99d920e8d66ac16332489d78ff7162e12':
  Send USER_SWITCHED with the correct permission
 2012-08-17 14:01:14 -07:00
Amith Yamasani
81c304b99d Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev 2012-08-17 13:58:17 -07:00
Amith Yamasani
1ab36c1d83 Send USER_SWITCHED with the correct permission 
Forgot to change this from MANAGE_ACCOUNTS to MANAGE_USERS.

Change-Id: Ib07d2ac84c19cef278a0e564676b6200e0f97dd1
 2012-08-17 13:55:02 -07:00
Robert Greenwalt
9f4f54c5d9 am 634f34af: am 5d683a01: am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" 
* commit '634f34af410ee181ef104260b2f31a87562eb4e0':
  Fix for updating TCP buffer size when switching network type
 2012-08-17 13:49:52 -07:00
Robert Greenwalt
634f34af41 am 5d683a01: am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" 
* commit '5d683a013114f38f503e6f7194400f60f35bfa5a':
  Fix for updating TCP buffer size when switching network type
 2012-08-17 13:47:44 -07:00
Robert Greenwalt
5d683a0131 am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" 
* commit 'c48ee60426a741d0a8e7df7df8af2a9ac24cee85':
  Fix for updating TCP buffer size when switching network type
 2012-08-17 13:44:54 -07:00
Jonathan Dixon
1b93e278c6 am 36aa961d: am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev 
* commit '36aa961d29840c0103ae61f40de88f55e37eb626':
  Remove checkThread() from findAddress
 2012-08-17 13:34:24 -07:00
Jonathan Dixon
36aa961d29 am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev 
* commit '9271fa6951a70fc837eeb7a18b22db5d098aecea':
  Remove checkThread() from findAddress
 2012-08-17 13:32:18 -07:00
Jonathan Dixon
9271fa6951 Merge "Remove checkThread() from findAddress" into jb-mr1-dev 2012-08-17 13:30:46 -07:00
Robert Greenwalt
c48ee60426 am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" 
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type
 2012-08-17 13:28:25 -07:00
Michael Jurka
4a2efa1a6e am 76070ed3: am d2ae85d4: Merge "Adding a thumbnail scale down animation" into jb-mr1-dev 
* commit '76070ed39749917efdd15be738f6172959b69acd':
  Adding a thumbnail scale down animation
 2012-08-17 13:08:09 -07:00
Michael Jurka
76070ed397 am d2ae85d4: Merge "Adding a thumbnail scale down animation" into jb-mr1-dev 
* commit 'd2ae85d41ec1651dd1bf4c33fe31833ba5c5cff5':
  Adding a thumbnail scale down animation
 2012-08-17 13:05:52 -07:00
John Reck
b5622dad65 Remove checkThread() from findAddress 
Bug: 6811978
 This doesn't need checked thread safety - static util methods should
 be thread safe.

Change-Id: Ib652d74ced66e3fa332464106a38522cd941a4cd
 2012-08-17 13:05:02 -07:00
Michael Jurka
d2ae85d41e Merge "Adding a thumbnail scale down animation" into jb-mr1-dev 2012-08-17 13:03:15 -07:00
Robert Greenwalt
6626398a72 Merge "Fix for updating TCP buffer size when switching network type" 2012-08-17 13:01:49 -07:00
Nick Pelly
240c53b7da am 74bd6670: am aeca6898: Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev 
* commit '74bd6670f8c3d902ab23918f79d4a637d66cd170':
  Fix regression from location changes: GPS battery tracking.
 2012-08-17 12:02:14 -07:00
Nick Pelly
74bd6670f8 am aeca6898: Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev 
* commit 'aeca6898041437a7e2ba68c1421b9be90669154d':
  Fix regression from location changes: GPS battery tracking.
 2012-08-17 12:00:16 -07:00
Nick Pelly
aeca689804 Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev 2012-08-17 11:57:52 -07:00
Nick Pelly
f2033e473a Fix regression from location changes: GPS battery tracking. 
The client UID list wasn't being saved, so we never removed
client UID's. As a result apps get blamed for GPS even when
they are no longer using it.

Bug: 7007314
Change-Id: Idff3b7c8c0ee87b99c9bdd7bd20d8391d0b1ac0f
 2012-08-17 11:56:39 -07:00
Dianne Hackborn
7066aafa13 am 73c4e53f: am 79af1dd5: Switch public APIs to use new UserHandle class for identifying users. 
* commit '73c4e53f0febb7ac0b454a15180ad0810950d6fe':
  Switch public APIs to use new UserHandle class for identifying users.
 2012-08-17 11:47:38 -07:00
Dianne Hackborn
73c4e53f0f am 79af1dd5: Switch public APIs to use new UserHandle class for identifying users. 
* commit '79af1dd54c16cde063152922b42c96d72ae9eca8':
  Switch public APIs to use new UserHandle class for identifying users.
 2012-08-17 11:45:29 -07:00
Jean-Baptiste Queru
1cdcf0a727 am 0dc70504: am f1b995f9: am 21bf4657: am a688af9c: Merge "TabHost key handling corrected" 
* commit '0dc70504cbd3cfe73b3cc02e2c733b7e5d8052c9':
  TabHost key handling corrected
 2012-08-17 11:03:59 -07:00
Jean-Baptiste Queru
adfd2f2b62 Merge 0dad3259 
Change-Id: I56e33b4ff87daaf2efcd6c88fadfe96401277c42
 2012-08-17 10:53:59 -07:00
Mita Yun
349da32a2d am d361aa93: (-s ours) Do not merge Added added logging for audio/video in mediaplayer.java 
* commit 'd361aa937b3072987d67e4087a42b713a88d44e8':
  Do not merge Added added logging for audio/video in mediaplayer.java
 2012-08-17 10:44:30 -07:00
Dianne Hackborn
79af1dd54c Switch public APIs to use new UserHandle class for identifying users. 
Gets rid of "yet another integer" confusion.

Change-Id: Id07ea7307aea7c62f0087c6663a1f1c08e2e5dee
 2012-08-17 10:36:08 -07:00
Mita Yun
d361aa937b Do not merge Added added logging for audio/video in mediaplayer.java 
Added eventlogs for the interval time and total time of audio and video
by user. Interval and total time will be logged when user pauses or
stops the media.

Change-Id: I5e50a38ce362aa527446a2cdaad1af6ff0fa9e66
 2012-08-17 10:26:34 -07:00
Jean-Baptiste Queru
0dc70504cb am f1b995f9: am 21bf4657: am a688af9c: Merge "TabHost key handling corrected" 
* commit 'f1b995f9d049cb5c7225b3b17f09369237a83ca2':
  TabHost key handling corrected
 2012-08-17 10:17:14 -07:00
Jean-Baptiste Queru
f1b995f9d0 am 21bf4657: am a688af9c: Merge "TabHost key handling corrected" 
* commit '21bf465764938c5f8c82dbf6061c89e138eb73ca':
  TabHost key handling corrected
 2012-08-17 10:15:32 -07:00
Jean-Baptiste Queru
21bf465764 am a688af9c: Merge "TabHost key handling corrected" 
* commit 'a688af9c6707c9c2f07cc195b072b6c14be03b63':
  TabHost key handling corrected
 2012-08-17 10:14:08 -07:00
Fabrice Di Meglio
0dad3259f2 am 54e5a825: Merge "Improve resolution of RTL related properties" into jb-mr1-dev 
* commit '54e5a825f2f82839e63e37ec32dc1b0757e95dfe':
  Improve resolution of RTL related properties
 2012-08-17 10:12:18 -07:00
Fabrice Di Meglio
54e5a825f2 Merge "Improve resolution of RTL related properties" into jb-mr1-dev 2012-08-17 10:09:39 -07:00
Victoria Lease
7aceca3b1d Merge "Han Preference" 2012-08-17 10:09:16 -07:00
Jean-Baptiste Queru
a688af9c67 Merge "TabHost key handling corrected" 2012-08-17 10:02:50 -07:00
Amith Yamasani
91413e745d am 745ec38b: am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev 
* commit '745ec38bdca1e86dd0093ade4a382880fda7743a':
  UserHandle to UserSerialNo mapping
 2012-08-17 09:24:34 -07:00
Amith Yamasani
745ec38bdc am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev 
* commit '9c38d6e52bb71671c6f034a10b6751a1569c9ee0':
  UserHandle to UserSerialNo mapping
 2012-08-17 09:22:55 -07:00
Amith Yamasani
9c38d6e52b Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev 2012-08-17 09:20:29 -07:00
Amith Yamasani
2a00329c6d UserHandle to UserSerialNo mapping 
Use AtomicFile for usermanager files.

Added a MANAGE_USERS permission that apps (signature permission) can use
to create/query/modify/remove users.

Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
 2012-08-17 09:06:10 -07:00
Magnus Strandberg
1968256926 Fix for updating TCP buffer size when switching network type 
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
 2012-08-17 11:38:44 +02:00
Joe Onorato
0058d79d86 am ae37cd4a: am bc11e52c: am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user" 
* commit 'ae37cd4a27c06f39b923fe4fc3c4c54914d73e9e':
  Get rid of LOCAL_MODULE_TAGS := user
 2012-08-17 01:02:41 -07:00
Joe Onorato
ae37cd4a27 am bc11e52c: am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user" 
* commit 'bc11e52cafa182996a338641c86bf3a07f571b1d':
  Get rid of LOCAL_MODULE_TAGS := user
 2012-08-17 00:52:12 -07:00
Joe Onorato
bc11e52caf am 406ba831: am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user" 
* commit '406ba83154ba17921bc524c479d3339448306fc5':
  Get rid of LOCAL_MODULE_TAGS := user
 2012-08-17 00:50:11 -07:00
Joe Onorato
406ba83154 am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user" 
* commit '5f61087e26013ea2623aecb1783c74a57a9fa49c':
  Get rid of LOCAL_MODULE_TAGS := user
 2012-08-17 00:48:03 -07:00
Joe Onorato
5f61087e26 Merge "Get rid of LOCAL_MODULE_TAGS := user" 2012-08-17 00:40:50 -07:00
Jeff Sharkey
f9196d2bec am 603aeda5: am bdd0c91b: Merge "Create media paths for existing users." into jb-mr1-dev 
* commit '603aeda5a67b6c7a54f2dea50d5f05113e437d14':
  Create media paths for existing users.
 2012-08-16 23:36:02 -07:00
Jeff Sharkey
603aeda5a6 am bdd0c91b: Merge "Create media paths for existing users." into jb-mr1-dev 
* commit 'bdd0c91ba82bd8eb319c8fe0fb046512b0d0a49b':
  Create media paths for existing users.
 2012-08-16 23:33:43 -07:00
Jeff Sharkey
bdd0c91ba8 Merge "Create media paths for existing users." into jb-mr1-dev 2012-08-16 23:31:50 -07:00
Jeff Sharkey
91bbb8a1e9 Create media paths for existing users. 
Bug: 6925012
Change-Id: I23bd9187217645cf538e074527c143a911a61299
 2012-08-16 23:29:34 -07:00
Joe Onorato
fffd12249d Get rid of LOCAL_MODULE_TAGS := user 
Change-Id: I1c4e67f935a7c511cda9980f4475dfd0272617a5
 2012-08-16 22:46:41 -07:00