80237 Commits

Author SHA1 Message Date
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
Robert Greenwalt
6626398a72 Merge "Fix for updating TCP buffer size when switching network type" 2012-08-17 13:01:49 -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
Jean-Baptiste Queru
a688af9c67 Merge "TabHost key handling corrected" 2012-08-17 10:02:50 -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
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
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
2679082da0 Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465
2012-08-16 18:56:53 -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
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
Kenny Root
a950daf5c1 Merge changes Ieb566a2a,I953057cd
* changes:
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
2012-08-16 16:06:29 -07:00
Jean-Baptiste Queru
b18bcf13fd am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"
* commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
  Fix Issue #35489: drm content corruption on GB
2012-08-16 15:29:47 -07:00
Kenny Root
a2e8365cc8 am 9b0da58e: Merge "Introduce a restorecon JNI binding."
* commit '9b0da58e3a30b760de37138cdd51d20f269c383e':
  Introduce a restorecon JNI binding.
2012-08-16 15:29:41 -07:00
Kenny Root
617ccc081f am 1090f702: Merge "Remove StatFs from AndroidRuntime JNI"
* commit '1090f7023abefc448a492e143f76f9e0925fd6ee':
  Remove StatFs from AndroidRuntime JNI
2012-08-16 15:29:34 -07:00
Madan Ankapura
b046b20f1a show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2012-08-16 15:29:17 -07:00
Kenny Root
98e15e7893 Use Libcore's stat instead of FileUtils#getFileStatus
Remove the last user of FileUtils#getFileStatus and move it to
Libcore.os.stat instead. Then we can remove the JNI code that does the
equivalent of a stat.

Change-Id: Ieb566a2a8a17c2dd0150724b4eb3ac1cc41c823d
2012-08-16 15:27:55 -07:00
Kenny Root
786cbcacd2 Use Libcore.os.stat instead of FileUtils
PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.

This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.

Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
2012-08-16 15:27:55 -07:00
Jean-Baptiste Queru
d2fb6e99bd Merge "Fix Issue #35489: drm content corruption on GB" 2012-08-16 14:45:12 -07:00
Kenny Root
9b0da58e3a Merge "Introduce a restorecon JNI binding." 2012-08-16 14:38:30 -07:00
Kenny Root
1090f7023a Merge "Remove StatFs from AndroidRuntime JNI" 2012-08-16 14:37:31 -07:00
Kenny Root
89db6a40af Remove StatFs from AndroidRuntime JNI
Change-Id: I88039794cf3e4a959b37c29c67f16f2dc0751a5c
2012-08-16 14:31:31 -07:00
Kenny Root
d69b47c087 am 8942e5a3: Merge "Use libcore Posix class for StatFs implementation"
* commit '8942e5a32ae2d1a36b65efe5b26cc06227ea0ca5':
  Use libcore Posix class for StatFs implementation
2012-08-16 14:22:31 -07:00
Kenny Root
8942e5a32a Merge "Use libcore Posix class for StatFs implementation" 2012-08-16 13:37:25 -07:00
Kenny Root
bdd23ae9f5 Use libcore Posix class for StatFs implementation
Remove some JNI and duplicated functionality and use libcore's Posix
class for the statfs function instead.

Change-Id: Ic1e161dc10c18c2c6ee81d895a0efd8910086dbf
2012-08-16 10:55:47 -07:00
Svetoslav Ganov
80c904df15 am 8631701b: Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.
* commit '8631701bb770f3a4e3b2a139dc282f2244fe86e6':
  Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.
2012-08-16 10:36:55 -07:00
Svetoslav Ganov
8631701bb7 Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.
1. Before JellyBean touch exploration was a global setting controlled by the user via
   the UI. However, if the enabled accessibility services do not handle touch exploration
   mode, enabling it makes no sense. Therefore, in JellyBean the services request touch
   exploration mode and the user is presented with a dialog to allow that and if she
   does we store that in the database.

   As a result of the above change a user that has enabled  accessibility, touch
   exploration, and some accessibility services running a pre-JellyBean system
   version may lose touch exploration state, thus rendering the device useless unless
   sighted help is provided, since the enabled service(s) are not in the list of
   services to which the user granted a permission to put the device in touch explore
   mode.

   The fix is during a database upgrade to allow allow all enabled accessibility
   services to toggle touch exploration provided accessibility and touch exploration
   are enabled and no services can toggle touch exploration. Note that the user has
   already manually enabled the services and touch exploration which means the she
   has given consent to have these services work in touch exploration mode

bug:6996354

Change-Id: I0af2dc578cc4fbcc90043341035163b876978ab2
2012-08-15 22:13:03 -07:00
Scott Main
91d08fe51a am 2d9063bc: docs: Add a few links and small edits to a couple layout guides
* commit '2d9063bc705aae7ef4cc90206ece03d4caeefba7':
  docs: Add a few links and small edits to a couple layout guides
2012-08-15 15:37:39 -07:00
Scott Main
2d9063bc70 docs: Add a few links and small edits to a couple layout guides
Change-Id: I4c0c043782524a29f7fb8fcb54cc26d7399c39fc
2012-08-15 15:11:19 -07:00
Scott Main
f5d4970a1f am 9047e466: Merge "docs: fix markup bug; remove extra </div>" into jb-dev
* commit '9047e46657ad21e73bae5465ef00e29a84ad53a4':
  docs: fix markup bug; remove extra </div>
2012-08-15 14:49:33 -07:00
Scott Main
9047e46657 Merge "docs: fix markup bug; remove extra </div>" into jb-dev 2012-08-15 14:47:30 -07:00
Scott Main
02d74a28ee docs: fix markup bug; remove extra </div>
Change-Id: I9d1fd280b5f077a423f12ce8e226d09e5e9f7b2b
2012-08-15 14:42:48 -07:00
Scott Main
13f5ed254a am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev
* commit '18c2045bed1ee4e5615947bdc4539a6b4d4a1d23':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
2012-08-15 09:49:47 -07:00
Scott Main
18c2045bed Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 2012-08-15 09:47:27 -07:00
Dianne Hackborn
977abbb887 am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on
2012-08-14 19:31:55 -07:00
Dianne Hackborn
48de12c5d1 Merge "Keep keyguard from starting after finished call when screen is on" 2012-08-14 18:51:00 -07:00
Scott Main
d54bc8009f am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to ch
* commit '71c4fc818dae494f4acdb24bb6d1b899ddc5e07d':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
2012-08-14 14:26:14 -07:00
Scott Main
71c4fc818d Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future." into jb-dev 2012-08-14 14:23:40 -07:00
Scott Main
911711fd31 revise info on Search button availability... behavior not guaranteed either
bug: 6966922

Change-Id: I4122e6fb99b95da3f53b56333a5f27d2adde6d44
2012-08-14 13:20:53 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
2012-08-14 12:40:41 -07:00
Scott Main
6958c161a9 Merge "docs: misc bug fixes from external issues" into jb-dev 2012-08-14 12:38:22 -07:00
Scott Main
d632b43fab docs: change download URLs for design assets.
These new URLs are dummies that are handled by a redirect rule for
all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/
Using this redirect allows us to change the storage location of the download assets in the future.

Change-Id: I0dc6ecc1a6898f1256ba4c9ff90b619366e47629
2012-08-14 11:44:09 -07:00
Wink Saville
d660b610c8 am 116748d0: Merge "show 3G icon for CDMA/1xRTT" into jb-dev
* commit '116748d0d16f8e747fdfdaf2326d9a58bb2317d5':
  show 3G icon for CDMA/1xRTT
2012-08-14 10:42:50 -07:00
Wink Saville
116748d0d1 Merge "show 3G icon for CDMA/1xRTT" into jb-dev 2012-08-14 10:40:34 -07:00
Madan Ankapura
5333400bd5 show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2012-08-14 10:17:54 -07:00
Daniel Hansson
4b71686d09 Keep keyguard from starting after finished call when screen is on
Previously keyguard would start after a call ended, even though
the screen was on, if the screen had not been turned off since
phone startup.

Change-Id: I03c18a0bb2a58760614645871f4703afb9a0677d
2012-08-14 13:42:36 +02:00
Mike Lockwood
f02354e208 am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:42:42 -07:00
Mike Lockwood
9064a48365 Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 2012-08-13 19:59:38 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
2012-08-13 19:12:13 -07:00
Peter Ng
55ed7e34b9 am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev
* commit '3e504ac71715a1b152494c9765f41d13bc605b75':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
2012-08-13 16:57:05 -07:00