Commit Graph

26234 Commits

Author SHA1 Message Date
Kenny Root
6b9b818948 am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
  Allow updated system apps to retain priority
2011-01-12 19:01:48 -08:00
Andreas Huber
d81436b00d am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:01:37 -08:00
Andreas Huber
b2bc1bb5ff am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
  DO NOT MERGE: Fix Matroska issues
2011-01-12 19:01:17 -08:00
Chet Haase
695e85dcdd am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
* commit 'ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
  Supress layout requests while a LayoutTransition is running.
2011-01-12 18:35:14 -08:00
Chet Haase
3bb966338b Merge "Supress layout requests while a LayoutTransition is running." into honeycomb 2011-01-12 18:33:05 -08:00
Xavier Ducrohet
923977448c am cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
* commit 'cb27d4b2f530033c90432745115b914d8f26c3e7':
  LayoutLib: use tags in logs.
2011-01-12 18:24:52 -08:00
Xavier Ducrohet
262d0eb2c0 Merge "LayoutLib: use tags in logs." into honeycomb 2011-01-12 18:23:04 -08:00
repo sync
cd3bf6ab65 am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.
2011-01-12 17:58:48 -08:00
Kenny Root
4d55db3c88 am 4aab4bc2: am 91c459ec: Copy user info from PackageSetting as well
* commit '4aab4bc2a3b97e25573e8484d5f5aa8deb812d48':
  Copy user info from PackageSetting as well
2011-01-12 17:58:25 -08:00
Chung-yih Wang
9cdc17ab15 am eb74d1aa: am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit 'eb74d1aab5f67ae3a4123fbab9a419595fab081c':
  Add auth. username in SipProfile.
2011-01-12 17:58:08 -08:00
Nick Pelly
bcaab29a1f am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
* commit 'a058f565663253077c3118d9aad00e03dcd45684':
  Update API current.xml to unbreak build.
2011-01-12 17:57:30 -08:00
Carl Shapiro
35b29de581 am e9739d09: Merge "Note the release in which functionality was deprecated." into honeycomb
* commit 'e9739d09cb53fd05cc9229049b3d54c7f6816450':
  Note the release in which functionality was deprecated.
2011-01-12 17:23:37 -08:00
Carl Shapiro
559acb0c46 Merge "Note the release in which functionality was deprecated." into honeycomb 2011-01-12 17:21:46 -08:00
Elliott Hughes
44e8d146aa am f7bb4044: Merge "Fix build." into honeycomb
* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
  Fix build.
2011-01-12 17:16:17 -08:00
Elliott Hughes
0efc8e9335 Merge "Fix build." into honeycomb 2011-01-12 17:14:43 -08:00
Joe Onorato
c29249784b am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb
* commit 'f4699efb635dc7695e346343e9b9024ed225a612':
  Possibly fix bad notification updates.
2011-01-12 17:09:06 -08:00
Joe Onorato
d708400c1f Merge "Possibly fix bad notification updates." into honeycomb 2011-01-12 17:07:11 -08:00
Carl Shapiro
541d75c9ad am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
* commit '0123afbb228c2849f481b5219ce82c070562b04a':
  Deprecate the allocation limit interfaces.
2011-01-12 17:04:38 -08:00
Carl Shapiro
f01c2a64f0 Merge "Deprecate the allocation limit interfaces." into honeycomb 2011-01-12 17:02:18 -08:00
James Dong
48d3229c73 am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
  Remove legacy code that should not be used
2011-01-12 16:41:36 -08:00
James Dong
d1b8deb429 Merge "Remove legacy code that should not be used" into honeycomb 2011-01-12 16:39:43 -08:00
Romain Guy
9517572279 am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
* commit 'd6b13534d44faee5bf80eb02495c17aa0195d381':
  Only enable GL rendering on the main thread.
2011-01-12 16:24:27 -08:00
Romain Guy
64457f1e73 Merge "Only enable GL rendering on the main thread." into honeycomb 2011-01-12 16:22:48 -08:00
Amith Yamasani
680a2e3642 am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
* commit 'e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
  Remove popup indicator for dialog style preference items.
2011-01-12 16:00:59 -08:00
Amith Yamasani
22ac53c5c0 Merge "Remove popup indicator for dialog style preference items." into honeycomb 2011-01-12 15:59:02 -08:00
Joe Onorato
688f7e2a43 am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
* commit '895eee7bac7dad66b51406d23529bec1dc9ad901':
  Remove the volume slider in SystemUI.
2011-01-12 15:48:45 -08:00
Joe Onorato
22284cfd09 Merge "Remove the volume slider in SystemUI." into honeycomb 2011-01-12 15:47:08 -08:00
Gilles Debunne
69c07d4b8d am 95a95717: New menu_dropdown_panel assets.
* commit '95a9571702e64857e7d8d7dc6c8a46caec874a6b':
  New menu_dropdown_panel assets.
2011-01-12 15:42:43 -08:00
Martijn Coenen
3e07c1af48 am 261fa998: am 25be5365: Implement canMakeReadonly().
* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
  Implement canMakeReadonly().
2011-01-12 15:31:07 -08:00
James Dong
9f59608946 am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-12 15:31:01 -08:00
Nick Pelly
d6e0d942f2 am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:30:53 -08:00
Nick Pelly
566bd9a4d0 am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-12 15:30:41 -08:00
Jason Sams
2043cf4edb am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
  WAR driver bug where surfaces of size 0 fail.
2011-01-12 15:30:18 -08:00
Huahui Wu
3af420fb61 am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
  b/3344966 pan following the focus point instead the first point.
2011-01-12 15:30:14 -08:00
Jason Sams
64cdcdc2bf Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb 2011-01-12 15:28:19 -08:00
Huahui Wu
1f8c1433fd Merge "b/3344966 pan following the focus point instead the first point." into honeycomb 2011-01-12 15:27:16 -08:00
Jason Sams
aed09e5096 am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
  Implement more of copy2DRange*
2011-01-12 15:24:08 -08:00
Jason Sams
0a4079024e Merge "Implement more of copy2DRange*" into honeycomb 2011-01-12 15:22:09 -08:00
Justin Ho
dbb87df5f7 am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
* commit '63be8dd178447fce289c940638cd37aa560d9de3':
  Updated notification sounds for trygon
2011-01-12 15:08:24 -08:00
Romain Guy
90e7b48179 am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb
* commit 'b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
  Reenable region composition pipeline for layers Bug #3341848
2011-01-12 15:08:17 -08:00
Justin Ho
4d3df43e6d Merge "Updated notification sounds for trygon" into honeycomb 2011-01-12 15:06:19 -08:00
Romain Guy
ae2231040d Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb 2011-01-12 15:06:18 -08:00
Xia Wang
ee388225bb am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb
* commit '1aaae92f990bad51d503fe692def01191fda4db7':
  Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896
2011-01-12 15:03:41 -08:00
Jamie Gennis
656dbcae7b am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
* commit '103198a10cc22a49270a787d04b8ab484d2ec235':
  Implement crop & transform for SurfaceTexture.
2011-01-12 15:03:37 -08:00
Carl Shapiro
33856cf0f0 am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
* commit 'd688e5af1c95a8b5a482c146cd789c2be45f9663':
  Remove minimum heap size test now that the underlying interface is gone.
2011-01-12 15:03:34 -08:00
Marco Nelissen
3a71f107e0 am a8a656b0: Fix scanning of modified files.
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
  Fix scanning of modified files.
2011-01-12 15:03:28 -08:00
Kenny Root
b516ae7e56 am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb
* commit 'e7b2310a856889aa1e683104039033ada3f6b696':
  Make sure AppCacheTest casts to long
2011-01-12 15:03:24 -08:00
Brad Fitzpatrick
8d56d13571 am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
  Unhide Content{Resolver,Provider}.call()
2011-01-12 15:03:15 -08:00
Stephen Hines
5b1ae6d2e1 am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
* commit 'a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
  Unhide more of the RS APIs.
2011-01-12 15:03:07 -08:00
Xia Wang
ac6b50a8db Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb 2011-01-12 14:58:46 -08:00