80323 Commits

Author SHA1 Message Date
Irfan Sheriff
2140d1de47 Merge "Avoid system_server crashing due to mac address is null" 2012-08-22 10:48:23 -07:00
Jean-Baptiste Queru
29c6f24b25 am 6ffe2594: Merge "restorecon /data/anr directory."
* commit '6ffe2594674f250c16c5e3055aa69680efaa6f69':
  restorecon /data/anr directory.
2012-08-22 07:46:41 -07:00
Jean-Baptiste Queru
6ffe259467 Merge "restorecon /data/anr directory." 2012-08-22 07:18:39 -07:00
Wink Saville
b44b13a3f5 Empty DC's apnList when the DC is free.
Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.

Bug: 6939338
Change-Id: I17bc17cd1938ebac773db8131d12d0fa724348b0
2012-08-21 22:58:54 -07:00
Chih-Wei Huang
21326d8b77 Avoid system_server crashing due to mac address is null
It's possible that the mac address is null (getMacAddress() of WifiNative.java).
In this case system_server will crash like:

E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: WifiWatchdogStateMachine
E AndroidRuntime: java.lang.NullPointerException
E AndroidRuntime:        at android.net.arp.ArpPeer.<init>(ArpPeer.java:57)
E AndroidRuntime:        at android.net.wifi.WifiWatchdogStateMachine.doArpTest(WifiWatchdogStateMachine.java:866)

Check the mac address before parsing to avoid crashing.

Change-Id: I5d4205c04d479a3a2837172c6382816ea4bf74d6
2012-08-22 11:26:51 +08:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
2012-08-21 15:39:42 -07:00
Justin Ho
72404a82d3 Merge "Update Back softkey icon Bug: 6020915" into jb-dev 2012-08-21 15:19:15 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Justin Ho
962daf9b1c Update Back softkey icon
Bug: 6020915

Change-Id: I780f09bd1e99a10b2189ab253dd1a082118a385d
2012-08-21 14:21:29 -07:00
Jean-Baptiste Queru
34d8574665 am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()
2012-08-21 14:00:11 -07:00
Jean-Baptiste Queru
b8da225f26 Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 2012-08-21 13:09:19 -07:00
Jean-Baptiste Queru
f96fcd5095 am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes
2012-08-20 14:50:45 -07:00
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
2012-08-20 14:50:40 -07:00
Jean-Baptiste Queru
26f8ce83e0 Merge "To avoid the JNI memory leaks in video editor codes" 2012-08-20 14:29:51 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
Kenny Root
7d5b22afae am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask
2012-08-20 12:55:11 -07:00
Kenny Root
f029c22f82 Merge "Use Libcore.os.umask for setting umask" 2012-08-20 12:32:14 -07:00
Kenny Root
4c74f8c171 Use Libcore.os.umask for setting umask
Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
2012-08-20 12:24:05 -07:00
Dirk Dougherty
69b6a32f0c am a18cfcca: Doc change: Remove japanese localized index page.
* commit 'a18cfccac509e124d0a80c109a5711b336d41f75':
  Doc change: Remove japanese localized index page.
2012-08-20 11:42:30 -07:00
Dirk Dougherty
a18cfccac5 Doc change: Remove japanese localized index page.
Change-Id: I69b60435e7062d6ec39fe91595232695a37f591d
2012-08-20 11:25:49 -07:00
Jean-Baptiste Queru
6a37a25450 am e0024573: Merge "Release JNI local references as soon as possible."
* commit 'e00245737cc4844b77f95538e0728a4166b856a0':
  Release JNI local references as soon as possible.
2012-08-20 10:45:17 -07:00
Amith Yamasani
ff7735b0ee am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:45:12 -07:00
Jean-Baptiste Queru
e00245737c Merge "Release JNI local references as soon as possible." 2012-08-20 10:17:45 -07:00
Amith Yamasani
a3db5297cd Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 2012-08-20 10:16:36 -07:00
rpcraig
ec7ed14c18 restorecon /data/anr directory.
Restore the security contexts of anr directory
when initially created.

Change-Id: Ia731414ccbcdc7369d24be6db0003c53abcf6ef4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2012-08-20 06:08:01 -04:00
Vairavan Srinivasan
e4c56d9367 VibratorService: Fix to ensure actual delay in a vibrate pattern
delay might timeout early as value of duration isn't updated
correctly in the loop, should the wait be interrupted, to reflect
the elapsed time. Fix is to update duration in the loop.

Change-Id: I525b0e97799b288f46ae3a056cff7dcc69701bb0
2012-08-19 12:08:42 -07:00
Vairavan Srinivasan
7335cfd9bb ActivityThread: Avoid creating duplicate handlers and reuse mH
sMainThreadHandler is used for notification of changes in
SharedPreferences and refers to a new instance of Handler instead
of the existing instance, mH, of the ActivityThread. Fix to reuse
existing handlers associated with main looper.

Change-Id: I794a5802a9eacdb188bd0619db5e70e3ae89a07d
2012-08-18 18:36:03 -07:00
Jason Sams
aee28aa6b9 DO NOT MERGE - Fix readback lengths
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
2012-08-17 18:24:07 -07:00
Irfan Sheriff
bf3bf7cb60 Fix system server restart
Change-Id: Ia0b5e337726566ebc96901dadda3fc67eb967755
2012-08-17 16:19:22 -07:00
Henrik B Andersson
057b086e0e Release JNI local references as soon as possible.
The JNI layer has a fix amount (512) of jni references.
They should be released as soon as possible. In for
and while loops they can quickly reach the limit.

Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
2012-08-17 15:59:35 -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
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
wfeng6
c96a7294a4 To avoid the JNI memory leaks in video editor codes
There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.

Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
2012-08-17 10:22:57 +08:00
Yong Chen
da1c93ae4d Tests/RS: Add RS context check for RsBalls setAccel()
mRS could be null when lock and unlock screen by pressing power key
several times, it causes RsBalls crash. Add null pointer check to fix.

Change-Id: If37dee8609420daaff17772d5194cad5531f98e6
Author: Yong Chen <yong.a.chen@intel.com>
Signed-off-by: Yong Chen <yong.a.chen@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 31271
2012-08-17 10:04:21 +08: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