Commit Graph

28121 Commits

Author SHA1 Message Date
Jeffrey Brown
8ca4642b74 am edc93331: am a0d547b4: am dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (2) and others
* commit 'edc933318c9690761866a4da63b551ae09054104':
  fix hover events consume issue
2013-02-06 20:56:03 -08:00
Jeffrey Brown
6bd6b1c436 am 4e68024c: am 1e48b386: am 04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (2) and others
* commit '4e68024c7e9cf5849bc7c57266b0079113a2562f':
  Keep native callbacks when primary SQLiteConnection is recreated
2013-02-06 20:55:53 -08:00
Jeffrey Brown
e03ff19d72 am e646f943: am ca7b1210: am ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (2) and others
* commit 'e646f943fd7c4f9d81a4f2fb4de153a2ad9fd8bc':
  Potential NPE in SQLiteConnection
2013-02-06 20:55:49 -08:00
Jeffrey Brown
faffb8b2cc am f2873456: am 352d84b8: am 0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (2) and others
* commit 'f2873456dd2c7f93b63d4bd6bc0c742dfd153b62':
  Clear loaders array after they are destroyed.
2013-02-06 20:55:45 -08:00
Jeffrey Brown
8f1496980e am a3f82b1b: am e4ce2517: am b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit 'a3f82b1b2dca74e7f287912cd85069dd74b8bf4d':
  add reply.writeNoException() for quick response
2013-02-06 20:55:37 -08:00
Jeffrey Brown
edc933318c am a0d547b4: am dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (1) and others
* commit 'a0d547b43b3508c7253da234f529acf60d00fd13':
  fix hover events consume issue
2013-02-06 20:53:21 -08:00
Jeffrey Brown
4e68024c7e am 1e48b386: am 04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (1) and others
* commit '1e48b386eac8cb1ca9e6e50d73422661691512dc':
  Keep native callbacks when primary SQLiteConnection is recreated
2013-02-06 20:53:14 -08:00
Jeffrey Brown
e646f943fd am ca7b1210: am ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit 'ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
  Potential NPE in SQLiteConnection
2013-02-06 20:53:10 -08:00
Jeffrey Brown
f2873456dd am 352d84b8: am 0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (1) and others
* commit '352d84b841e7c81c259f5de576ea127d177b39f8':
  Clear loaders array after they are destroyed.
2013-02-06 20:53:06 -08:00
Jeffrey Brown
a3f82b1b2d am e4ce2517: am b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit 'e4ce25177bdf7720c6b3dd5ea7b48f6b03b06469':
  add reply.writeNoException() for quick response
2013-02-06 20:52:59 -08:00
Jeffrey Brown
a0d547b43b am dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Gerrit Code Review (1) and Masanori Ogino (1)
* commit 'dac4a90d656dca86bd14cd91d685c07d8a6b29a4':
  fix hover events consume issue
2013-02-06 20:50:13 -08:00
Jeffrey Brown
1e48b386ea am 04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '04ce0d253de9ec16f921824409a7b2c13195c19e':
  Keep native callbacks when primary SQLiteConnection is recreated
2013-02-06 20:50:04 -08:00
Jeffrey Brown
ca7b121029 am ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Gerrit Code Review (1) and You Kim (1)
* commit 'ea56499dc36d863f92857ab7f93e5c4436f9654f':
  Potential NPE in SQLiteConnection
2013-02-06 20:50:00 -08:00
Jeffrey Brown
352d84b841 am 0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
  Clear loaders array after they are destroyed.
2013-02-06 20:49:54 -08:00
Jeffrey Brown
e4ce25177b am b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'b314f433905ea2cbc62bd5af658f05261a752e5a':
  add reply.writeNoException() for quick response
2013-02-06 20:49:41 -08:00
Jeffrey Brown
dac4a90d65 Merge "fix hover events consume issue" 2013-02-07 04:40:30 +00:00
Jeffrey Brown
04ce0d253d Merge "Keep native callbacks when primary SQLiteConnection is recreated" 2013-02-07 04:15:32 +00:00
Jeffrey Brown
ea56499dc3 Merge "Potential NPE in SQLiteConnection" 2013-02-07 04:04:58 +00:00
Jeffrey Brown
0d47af1131 Merge "Clear loaders array after they are destroyed." 2013-02-07 03:59:20 +00:00
Jeffrey Brown
b314f43390 Merge "add reply.writeNoException() for quick response" 2013-02-07 03:46:48 +00:00
Jeff Sharkey
154be52ae7 Merge "Offer parsed TCP interface statistics." 2013-02-07 00:38:21 +00:00
Jeff Sharkey
4b17a1321d Offer parsed TCP interface statistics.
Also switch to newer iface_stat_fmt numbers, which are measured at
XT level instead of dev.

Bug: 7903145, 6569689
Change-Id: Ibeb742966b8c89916ea31a49388a5dbe25a5f67f
2013-02-06 16:23:12 -08:00
Mathias Agopian
ed77dce854 Merge "rework SystemSensorManager.java" 2013-02-06 23:32:42 +00:00
Dake Gu
d3a72135c8 am bfb64e85: am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and others
* commit 'bfb64e85e608889f18f4273b0f07a3d91d4082bd':
  SimulatdDpad: fix NPE for event without device
2013-02-06 15:11:29 -08:00
Adam Powell
2d9c0cac8b am 044a4c3e: am 351f7817: am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '044a4c3e4a42aae4faac8b92ea05f122cdf45f7c':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 15:11:24 -08:00
Dake Gu
bfb64e85e6 am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Dake Gu (1)
* commit '96111ddff7af61ce37fa8d9020d8e1eeba9095e8':
  SimulatdDpad: fix NPE for event without device
2013-02-06 15:01:17 -08:00
Adam Powell
351f7817e5 am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '21af9a08465c4927aab9db30efdfcf5ee8f52410':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 14:58:41 -08:00
Adam Powell
21af9a0846 Merge "avoid multiple-"0" to exceed the length of upper bound" 2013-02-06 22:11:19 +00:00
Svetoslav
ab080da60f Merge "Set accessibility cursor in non-text views with content description." 2013-02-06 20:12:03 +00:00
Svetoslav
bcc46a0d03 Set accessibility cursor in non-text views with content description.
We support text traversal at a granularity over non-next views with
content description, hence we should support setting the cursor position
in such views.

bug:8134469

Change-Id: I4dba225b0ade795b7a20c201fb906ae7146c065d
2013-02-06 11:58:03 -08:00
Derek Sollenberger
23e500d168 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-06 12:57:38 +00:00
Dianne Hackborn
0984780bc7 Merge "App ops: add op for writing settings." 2013-02-06 01:34:40 +00:00
Dianne Hackborn
961321fe4e App ops: add op for writing settings.
Also fix a build.

And fix a bug that I think was introduced in the multi-user work
that removed the permission check for writing to settings...!

Change-Id: I5945682faa789ffc78fd3546c0df7d03693f106d
2013-02-05 17:22:41 -08:00
Mathias Agopian
33c239f748 Merge "allow the framework to access a Sensor's handle" 2013-02-06 01:14:22 +00:00
Svetoslav
92826459d1 Fix a javaDoc error
Change-Id: Ia23660f102455aefad80cb75a8bbd8fc0d4455c3
2013-02-05 14:57:42 -08:00
Svetoslav
dc3edbb0e5 Merge "Rename a member variable" 2013-02-05 22:32:23 +00:00
Svetoslav
22431a3b6f Rename a member variable
Change-Id: I1f7a3b8119d84a1119637f79fcd3c29f8b79ef27
2013-02-05 14:31:39 -08:00
Craig Mautner
3fed9f185e am e57ed27a: am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Android Git Automerger (2) and others
* commit 'e57ed27a142bdc3b626d10b3806eb24df064e8d3':
  Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:30:08 -08:00
Craig Mautner
246a283c00 am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'fd5a0b3681499cbee0d1156b3b6f93fc91320848':
  Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:24:10 -08:00
Svetoslav
eecedffe42 Renaming some APIs
Change-Id: I9e226d39648796f95dd0e86ffecbb3f93544243b
2013-02-05 14:07:15 -08:00
Svetoslav Ganov
c163c606f6 Merge "Handle WebKit selection changes synchronously." 2013-02-05 21:47:22 +00:00
Svetoslav
191bdba819 Merge "Set accessibility cursor position in non-editable views with content description." 2013-02-05 21:45:50 +00:00
Svetoslav
d0c83cccca Set accessibility cursor position in non-editable views with content description.
While an accessibility service can set the cursor position in an editable
text field, it was not possible to set it for non-editable views with
content description. This patch enables that.

bug:8134469

Change-Id: I28b0ef1666b9e3ed5c0642718fbe63d4c9616569
2013-02-05 13:44:25 -08:00
Craig Mautner
fd5a0b3681 Merge "Fix unexpected rotation change when re-enabling auto-rotate" 2013-02-05 21:31:12 +00:00
Dianne Hackborn
f51f61269a App ops: new operations for SMS.
Implementation required a new framework feature
to associate an app op with a broadcast.

Change-Id: I4ff41a52f7ad4ee8fd80cbf7b394f04d6c4315b3
2013-02-05 11:56:12 -08:00
Alon Albert
0a35dd5660 Copy EVENT_COLOR_KEY as String
Change-Id: I84eda41d0b9c091f3d152cc3e899cb40b52ed949
2013-02-05 11:07:56 -08:00
Alon Albert
59b3cfee69 am 2d6ef862: Merge "Add EVENT_COLOR\'s to Event Entity Iterator"
# Via Alon Albert (1) and Android (Google) Code Review (1)
* commit '2d6ef86241e981bff217891e52f2b689dae9a6c1':
  Add EVENT_COLOR's to Event Entity Iterator
2013-02-05 09:35:19 -08:00
Alon Albert
2d6ef86241 Merge "Add EVENT_COLOR's to Event Entity Iterator" 2013-02-05 17:30:50 +00:00
Martin Kosiba
5ee743eef7 Ensure the WebView provider is created onVisibilityChanged.
It is possible for onVisibilityChanged to be called during
WebView construciton.

BUG=7622923

Change-Id: Ie87dae537e1e6dd44d96e9e56982abbc134a31a0
2013-02-05 15:26:39 +00:00
Mathias Agopian
7f84c065fa allow the framework to access a Sensor's handle
this is needed in another CL to fix an issue where
sensors power usage is always reported as 0.

Change-Id: Ie496b98bf4b7e69911bdc99bee14cc924e1d71e8
2013-02-04 19:22:47 -08:00