79884 Commits

Author SHA1 Message Date
Stephen Hines
9f7fa4c417 Merge "DO NOT MERGE - Fix readback lengths" 2012-08-22 14:06:37 -07:00
Irfan Sheriff
e5773274d6 Merge "WifiWatchdog: handle exception from ArpPeer" 2012-08-22 10:57:50 -07:00
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
6ffe259467 Merge "restorecon /data/anr directory." 2012-08-22 07:18:39 -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
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -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
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
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
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
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
6626398a72 Merge "Fix for updating TCP buffer size when switching network type" 2012-08-17 13:01:49 -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
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
bxu10X
96ac720117 [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
When long press camera key, dispatchKeyEvent function will add control surface after the control view hide,
actually, we needn't show control view after we press camera key.

Change-Id: I45175c4eb97b3f13469cd9d8bacb295c9c5803dd
Author: Bin Xu <bxu10X@intel.com>
Signed-off-by: Bin Xu <bxu10X@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: 28344
2012-08-17 10:52:33 +08: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
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
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
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
Vairavan Srinivasan
8809004bc5 ProviderMap: remove hashmap when entire user specific entries are removed
User specific entries in  mProvidersByNamePerUser and mProvidersByClassPerUser
isn't cleared when entire user specific providers are removed. Fix is to remove
the user specific hashmap in such cases.

Change-Id: I6edf211ced873e59f3b89ffceb9eceec13ea8f3f
2012-08-15 23:37:45 -07:00
Johan Viktorsson
f363dfd26c Added check of ActivityInfo launch mode when starting activity.
When starting a singleTop activity from a singleInstance activity,
the onNewIntent() callback was not called when expected. The
reason for this was that only the launchMode specified on the
intent was checked and not the launchMode specified in the manifest.

Fixes issue 17137.

Change-Id: I1a9bc1007d6f5145bf93a6161534732bf5214b7a
2012-08-15 09:13:37 +02:00
Dianne Hackborn
48de12c5d1 Merge "Keep keyguard from starting after finished call when screen is on" 2012-08-14 18:51:00 -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
9064a48365 Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 2012-08-13 19:59:38 -07:00
Wink Saville
b17a583a3a Merge "Fix interface name for tethering" 2012-08-13 15:37:09 -07:00
Vishal Mahaveer
a6b6556082 Fix interface name for tethering
Fix the interface name used in stopTethering

Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-08-13 15:07:24 -07:00
git-you.kim72.gmail.com
fd20296c27 Fix Issue #35489: drm content corruption on GB
If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.

Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
2012-08-13 15:03:48 -07:00
Kenny Root
28dba4fc39 Merge "Update preloaded-classes for JB" 2012-08-13 11:42:07 -07:00
Wink Saville
eca6497704 Merge "Telephony: Signal Strength cleanup & LTE support" 2012-08-13 11:25:49 -07:00
Jean-Baptiste Queru
d7b9c6c356 Merge "Added missing viewport meta tag to html resources" 2012-08-13 10:38:23 -07:00
Jean-Baptiste Queru
4da3769d30 Merge "mediacodec: Don't crash if trying to open a codec that does not exist" 2012-08-13 09:30:11 -07:00
Kenny Root
f0e87175ba Merge "Remove useless TestRunner" 2012-08-13 09:01:36 -07:00
Martin Storsjo
e68323325b mediacodec: Don't crash if trying to open a codec that does not exist
Change-Id: If75e3156517993629f50622a84a9ac573fced815
2012-08-13 08:47:01 -07:00
SangWook Han
fd9cb499e5 Update preloaded-classes for JB
Change-Id: Id127308529d581c94bd2e911b637931156ce82c1
2012-08-12 19:46:51 +09:00