33923 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
a081fa662b am 9dfa3037: am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '9dfa30375e66ae533e253f5287a8c8e293187e19'

* commit '9dfa30375e66ae533e253f5287a8c8e293187e19':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
2010-10-11 18:57:33 -07:00
Gilles Debunne
8245acaab6 am 1457bb0e: am 6b8bdaa9: New AppsPermission and market style
Merge commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683'

* commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683':
  New AppsPermission and market style
2010-10-11 18:57:14 -07:00
Jeff Brown
9c9f1a3ba1 Track input state when transferring touch focus.
Copies the input state to the destination window and sends synthesic
cancelation events to the source window.

Change-Id: Ia75820b0d756ed5d6cd22dce7830251ac85141ed
2010-10-11 18:32:20 -07:00
Jeff Brown
a1160a798b Fix a bug synthesizing cancelation events for motions.
Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
2010-10-11 18:22:53 -07:00
Jeff Brown
4231124c9d Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Romain Guy
d5d2b7382c Merge "Don't draw fully transparent views/primitives." 2010-10-11 18:00:43 -07:00
Romain Guy
dbc26d2ba1 Don't draw fully transparent views/primitives.
Change-Id: Icd7d8ef1f57b51a24faf32f7004125e6300d4fdc
2010-10-11 17:58:29 -07:00
Jeff Brown
e20c9e0264 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Cherry pick of b931a1b4 from gingerbread into master.

Change-Id: I700a5f07b8b227878cea9437a289a45a245c0424
2010-10-11 17:54:12 -07:00
Jean-Baptiste Queru
02241ab292 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.
2010-10-11 17:49:42 -07:00
Jean-Baptiste Queru
76f8688e9b am 779d1778: am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'

* commit '779d1778b6147ee1b57428af234d1498a26f031e':
  Include debugger connection status in error entry
2010-10-11 17:49:28 -07:00
David Brown
a23935ab33 am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
2010-10-11 17:48:47 -07:00
Mike Lockwood
986d170182 am 1bdba9fa: am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'

* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-11 17:48:35 -07:00
Justin Ho
e13fc12941 am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf'

* commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-11 17:48:24 -07:00
Vasu Nori
182e5cf105 am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'

* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-11 17:43:34 -07:00
Brad Fitzpatrick
d532d8d8c1 am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-11 17:43:06 -07:00
Kenny Root
c30414329c am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
Merge commit 'de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp

* commit 'de846ac659e8c14d898a3fa14bd0504b24096057':
  Change to new binder implementation for OBB
2010-10-11 17:43:05 -07:00
Xavier Ducrohet
49bbd66251 am ceb3aae3: am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'

* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
  Avoid pre-processing images when they won't be used
2010-10-11 17:42:54 -07:00
Jeff Brown
dd8b0c9040 am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
2010-10-11 17:42:30 -07:00
Kenny Root
de846ac659 Merge "Change to new binder implementation for OBB" into gingerbread 2010-10-11 17:40:53 -07:00
Kenny Root
4a99ed8977 Change to new binder implementation for OBB
Change-Id: I3282df361a11fc37e94bc5ba4bd5860ae62a10e4
2010-10-11 17:38:51 -07:00
Stephen Hines
5d3f6073bf Merge "Support for unsigned long and unsigned long long." 2010-10-11 17:32:25 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Joe Onorato
0ad4a77cb7 am 1169f420: Merge "Add animation for the status bar going away." into gingerbread
Merge commit '1169f420f6df5cf5254fed883efa7e6780473c08' into gingerbread-plus-aosp

* commit '1169f420f6df5cf5254fed883efa7e6780473c08':
  Add animation for the status bar going away.
2010-10-11 17:26:59 -07:00
Jeff Brown
f2e0681ada am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp

* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
  Fix an event injection bug when the policy is bypassed.
2010-10-11 17:26:51 -07:00
Joe Onorato
d965724fdc am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
Merge commit '44104df10660c711129fd263364afc2174f40ac2' into gingerbread-plus-aosp

* commit '44104df10660c711129fd263364afc2174f40ac2':
  Fix status bar flashing after orientation change
2010-10-11 17:26:38 -07:00
Kenny Root
1c67b7af01 am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp

* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
  Grant URI permissions to the MCS
2010-10-11 17:26:07 -07:00
Kenny Root
b4de3dca96 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Romain Guy
20b4cf8cc7 Merge changes I9a5e01bc,If1caee31
* changes:
  Optimize GLSL shaders.
  Improve performance of linear gradients.
2010-10-11 17:13:32 -07:00
Joe Onorato
1169f420f6 Merge "Add animation for the status bar going away." into gingerbread 2010-10-11 16:37:41 -07:00
Joe Onorato
bb60d1e36b Add animation for the status bar going away.
Bug: 3077525
Change-Id: I0c166fc161f8febe963e667259517173b9ac609b
2010-10-11 16:35:48 -07:00
Romain Guy
707b2f78cc Optimize GLSL shaders.
Change-Id: I9a5e01bced63d8da0c61330a543a2b805388a59d
2010-10-11 16:34:59 -07:00
Jeff Brown
1da8d4d169 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Joe Onorato
44104df106 Merge "Fix status bar flashing after orientation change" into gingerbread 2010-10-11 16:26:36 -07:00
Jeff Brown
b931a1b418 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Joe Onorato
0d7349bd92 Fix status bar flashing after orientation change
hand merge 43a87c5c874f1b8fbf582ff522f10051a6434906
and add some more fixes

Change-Id: Iea608bfba37e2e4c6a3430c13f683e54b0eff64b
2010-10-11 16:24:50 -07:00
Stephen Hines
52d836332f Support for unsigned long and unsigned long long.
Change-Id: I2f9cfb7f352e2e7e7fd49eac42a821c03b5fcb9f
2010-10-11 16:10:42 -07:00
Kenny Root
a4e95dfea4 Merge "Grant URI permissions to the MCS" into gingerbread 2010-10-11 15:49:30 -07:00
Jean-Baptiste Queru
cf88cf878b am 15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp

* commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
  Fix compile errors in telephony tests
2010-10-11 15:32:12 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
c0ad216c8e Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 2010-10-11 15:19:47 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Scott Main
ad9a559c61 am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp

* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:15:09 -07:00
Stephen Hines
1e1ebcb2d0 Merge "Test exported "long" type." 2010-10-11 15:14:36 -07:00
Jean-Baptiste Queru
15f7ff3c5a Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Kenny Root
1112857632 Grant URI permissions to the MCS
When the PackageManagerService is asked to install from a URI, it might
be explicitly granted the permission to read from the URI content
provider. We need to pass along these permissions to the
MediaContainerService (DefaultContainerService) to ensure the MCS can
read from the content provider.

Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
2010-10-11 15:11:12 -07:00
Irfan Sheriff
c949b9c3ff Retry quicker for control channel setup
Bug: 2976277
Change-Id: Ifedb0c1aebefc251028e8d2f578f530a3840c702
2010-10-11 15:07:20 -07:00
Scott Main
3d90d11a7b am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread

* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:04:20 -07:00
Alex Sakhartchouk
75a3bcc36b Merge "Update allocation from bitmap. GL attribute cleanup in type." 2010-10-11 15:03:29 -07:00
Chris Tate
a75803e950 am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp

* commit '0a7892367f46e3653e9857195ec19356f848b7f8':
  Temporarily turn on backup/restore debug logs
2010-10-11 14:45:22 -07:00