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

83532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Amith Yamasani
a3f133afe8 Save preferred activity info with user id. 
So each user can have their own set of intent resolution preferences.

ResolverActivity now launches the activity on the correct user, and
persists the preference for the correct user.

Bug: 6961905
Change-Id: I6d3a8a9af89bc649277d4fc8d0f367ee123f8392
 2012-08-17 13:32:02 -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
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
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
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
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
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
Jean-Baptiste Queru
a688af9c67 Merge "TabHost key handling corrected" 2012-08-17 10:02:50 -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
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
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
0e462950d9 Get rid of LOCAL_MODULE_TAGS := user 
Change-Id: I1c4e67f935a7c511cda9980f4475dfd0272617a5
 2012-08-16 22:37:58 -07:00
The Android Open Source Project
259156444c Reconcile with jb-mr1-release - do not merge 
Change-Id: Ica4f7fbb23b13d145c11f1e58fdd68011b435ee3
 2012-08-16 19:10:29 -07:00
The Android Open Source Project
f2e3e89917 am 1da9902f: am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '1da9902f2ed51221a10f4e61e45c078f4d2eec92':
  show 3G icon for CDMA/1xRTT
 2012-08-16 19:02:02 -07:00
The Android Open Source Project
1da9902f2e am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '2679082da074b29be8ac8e6f9bb02591318be388':
  show 3G icon for CDMA/1xRTT
 2012-08-16 18:59:11 -07:00
The Android Open Source Project
2679082da0 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465
 2012-08-16 18:56:53 -07:00
Nick Pelly
2f7242565c am 76b858e3: Merge "Add documentation for com.android.location.provider shared library." into jb-mr1-dev 
* commit '76b858e3794f652c4af2323504787aebbbb7e89a':
  Add documentation for com.android.location.provider shared library.
 2012-08-16 18:09:50 -07:00
Nick Pelly
78e9ea9c7b am 1f3f128a: Merge "Add javadoc for new location API\'s." into jb-mr1-dev 
* commit '1f3f128ad1744dfbe4108857f322a805b1dc5eb7':
  Add javadoc for new location API's.
 2012-08-16 18:08:09 -07:00
Nick Pelly
76b858e379 Merge "Add documentation for com.android.location.provider shared library." into jb-mr1-dev 2012-08-16 18:07:28 -07:00
Nick Pelly
1f3f128ad1 Merge "Add javadoc for new location API's." into jb-mr1-dev 2012-08-16 18:05:32 -07:00
Nick Pelly
b03c8c508d Add documentation for com.android.location.provider shared library. 
Change-Id: I222d61811c88272e84a85512623210c0238337e5
 2012-08-16 17:59:35 -07:00
Nick Pelly
4e31c4fffb Add javadoc for new location API's. 
Change-Id: If15024ee88421c07ba3a174747774fc451fd002e
 2012-08-16 17:59:34 -07:00
The Android Automerger
ed970b4899 merge in jb-mr0-release history after reset to jb-dev 2012-08-16 17:57:44 -07:00
Subir Jhanb
b4b692f9a8 am 2ff0c048: Merge "Change directory permission to "signature|system"" into jb-mr1-dev 
* commit '2ff0c048446c47f9cb995def2a6d8cc5177533a2':
  Change directory permission to "signature|system"
 2012-08-16 17:20:34 -07:00
Subir Jhanb
2ff0c04844 Merge "Change directory permission to "signature|system"" into jb-mr1-dev 2012-08-16 17:18:21 -07:00
Subir Jhanb
0224ccab3c Change directory permission to "signature|system" 
Change-Id: I53dea6984b4577803fdead5caad0112503d2b4e5
 2012-08-16 17:04:54 -07:00
Kenny Root
799ee2127e am 9a994b53: am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd 
* commit '9a994b5350731b8169a9b25463f57266ee2988fb':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
 2012-08-16 16:46:46 -07:00
Kenny Root
9a994b5350 am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd 
* commit '050c87f87e2a48c7bc90f5b15fb6e4e37e667286':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
 2012-08-16 16:43:20 -07:00
Kenny Root
050c87f87e am a950daf5: Merge changes Ieb566a2a,I953057cd 
* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
 2012-08-16 16:33:40 -07:00