Dianne Hackborn
513f68bc5a
am bfe20d1a: am 8bfba7df: Merge "fix wrong substring"
...
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
fix wrong substring
2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d
am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents"
...
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
Protecting more views from (bad) MotionEvents
2012-08-23 15:12:21 -07:00
Dianne Hackborn
8bfba7df37
Merge "fix wrong substring"
2012-08-23 14:10:31 -07:00
Johan Rosengren
0dc291eef6
Protecting more views from (bad) MotionEvents
...
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In 2585e9b there were checks added, this change adds
some more.
Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
2012-08-23 13:46:14 +02:00
Masanori Ogino
08bab56f68
fix wrong substring
...
The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.
How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"
Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
2012-08-23 14:06:45 +09:00
Irfan Sheriff
c584a24ba1
am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"
...
* commit '2140d1de47579db839b6a4ccc87394e80449d7a6':
Avoid system_server crashing due to mac address is null
2012-08-22 11:01:03 -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
Dianne Hackborn
b0b4a70440
Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
2012-08-21 15:12: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
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
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
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
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
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
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
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
Kenny Root
9b0da58e3a
Merge "Introduce a restorecon JNI binding."
2012-08-16 14:38:30 -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
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
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
183bf11697
docs: misc bug fixes from external issues
...
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
2012-08-13 19:12:13 -07:00
Jean-Baptiste Queru
82c2ff5546
am d7b9c6c3: Merge "Added missing viewport meta tag to html resources"
...
* commit 'd7b9c6c356038ebced3461bb098b6a1ea1c7b222':
Added missing viewport meta tag to html resources
2012-08-13 10:53:58 -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
cb80cb700d
am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit '37548994e69292932e9e2fafb7cba6c53e3a2bcd':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 09:26:53 -07:00
Jean-Baptiste Queru
37548994e6
Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
2012-08-10 09:04:05 -07:00
mike wakerly
ceff341550
am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
Fix typo in UsbManager javadoc.
2012-08-09 16:49:07 -07:00
mike wakerly
0099d67d68
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 16:31:26 -07:00
Jean-Baptiste Queru
e5c46faefb
am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit '6d0dd51ebb170a89bea614a558b96f1dff3e7723':
Return early when checking divider before child zero.
2012-08-08 14:04:08 -07:00
Jean-Baptiste Queru
807c7ae00b
am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:04:02 -07:00
Jean-Baptiste Queru
6d0dd51ebb
Merge "Return early when checking divider before child zero."
2012-08-08 13:20:07 -07:00
Jean-Baptiste Queru
7835d4fb4e
Merge "Fix SurfaceView notifies on invalid surfaces."
2012-08-08 13:20:00 -07:00
Jean-Baptiste Queru
bce4135879
am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c
am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
9ab84c203f
Merge "Fix wrong count return for getPhoneSignalStrengthCount"
2012-08-08 12:59:06 -07:00
Jean-Baptiste Queru
6fb8fe9aba
Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
2012-08-08 12:06:26 -07:00
Jean-Baptiste Queru
64ed6b2cfa
am d77d17c2: Merge "Fix cursor memory leak"
...
* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
Fix cursor memory leak
2012-08-08 10:54:04 -07:00
Jean-Baptiste Queru
425d13a0ae
am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
Adds missing Bluetooth as network type.
2012-08-08 10:53:52 -07:00
Jean-Baptiste Queru
d77d17c28d
Merge "Fix cursor memory leak"
2012-08-08 10:44:50 -07:00
Jean-Baptiste Queru
2278e60c39
Merge "Adds missing Bluetooth as network type."
2012-08-08 10:43:20 -07:00
Scott Main
a8583c2934
am 40eee61e: docs: fix broken links and update sitemap text file
...
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
docs: fix broken links and update sitemap text file
2012-08-07 14:04:04 -07:00
Scott Main
40eee61e25
docs: fix broken links
...
and update sitemap text file
Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
2012-08-06 18:04:23 -07:00