Commit Graph

18188 Commits

Author SHA1 Message Date
Chet Haase
28f96e9a81 am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp

* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
  Adding new assets for designers
2010-09-15 21:16:35 -07:00
Chet Haase
30aeb8c854 Merge "Adding new assets for designers" into gingerbread 2010-09-15 21:14:09 -07:00
Jeff Brown
c491d8857e am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread
Merge commit 'f4d788c9309bc5480100d980608472e4cb04f309' into gingerbread-plus-aosp

* commit 'f4d788c9309bc5480100d980608472e4cb04f309':
  Make input dispatcher only ANR for foreground windows.
2010-09-15 18:57:48 -07:00
Jeff Brown
fe6f34246e Merge "Make input dispatcher only ANR for foreground windows." into gingerbread 2010-09-15 18:55:25 -07:00
Jeff Brown
53a415e6d1 Make input dispatcher only ANR for foreground windows.
Redesigned the input dispatcher's ANR timeout mechanism so it is much
closer to Froyo's policy.  ANR is only ever signalled if the dispatcher
is waiting on a window to finish processing its previous event(s) and
there is new pending input.

In the old code, we tracked the dispatch timeout separately for each
input channel.  This was somewhat complicated and also resulted in the
situation where applications could ANR long after the user had pushed
them into the background.

Change-Id: I666ecada0952d4b95f1d67b9f733842b745c7f4b
2010-09-15 18:52:08 -07:00
David Brown
e555aaaca5 am 747c6153: ContactsContract: update SipAddress to be multi-valued
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp

* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
  ContactsContract: update SipAddress to be multi-valued
2010-09-15 18:38:25 -07:00
Robert Greenwalt
a89c3d03d8 am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
bcd2ed6d32 Merge "Update Inet Connection Status display" into gingerbread 2010-09-15 17:59:54 -07:00
Chris Palmer
3ae681ba2d am b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit 'b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp

* commit 'b8dbdc293a8495a873a9c36353d6a9408c698256':
  Clarify the danger of READ_LOGS and DUMP permissions.
2010-09-15 17:33:22 -07:00
Andreas Huber
4bb4dcce21 am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread
Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp

* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
  Upgrade to the latest .webm project code.
2010-09-15 17:24:53 -07:00
Wu-cheng Li
96cf74540c am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
  Fix the runtime restart due to name change.
2010-09-15 17:24:40 -07:00
Andreas Huber
c9d0991a29 Merge "Upgrade to the latest .webm project code." into gingerbread 2010-09-15 16:23:06 -07:00
Erik
44c9156856 am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp

* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
  b/3004029 Fixed content resolver loss
2010-09-15 15:54:27 -07:00
Erik
d4014122d7 am 344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp

* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
  Close tz query cursor when done.
2010-09-15 15:54:22 -07:00
Erik
15caeb81ad Merge "b/3004029 Fixed content resolver loss" into gingerbread 2010-09-15 15:51:53 -07:00
Erik
aaab513852 Merge "Close tz query cursor when done." into gingerbread 2010-09-15 15:51:37 -07:00
Chet Haase
7c10d94225 am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp

* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
  Add new/changed drawable assets from design team
2010-09-15 15:36:58 -07:00
Chet Haase
a295cadc65 Merge "Add new/changed drawable assets from design team" into gingerbread 2010-09-15 15:33:31 -07:00
Wu-cheng Li
f54200e66c am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp

* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
  Update camera API and javadoc for API review comments.
2010-09-15 15:01:09 -07:00
Wu-cheng Li
0182b666c5 Merge "Update camera API and javadoc for API review comments." into gingerbread 2010-09-15 14:57:59 -07:00
James Dong
c483004c9a am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread
Merge commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e' into gingerbread-plus-aosp

* commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e':
  Add some explicit error log messages
2010-09-15 14:55:46 -07:00
James Dong
0c8ac6cabc am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp

* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
  Fix audio input sample timestamp when audio driver loses audio samples
2010-09-15 14:55:38 -07:00
James Dong
762575bba2 Merge "Add some explicit error log messages" into gingerbread 2010-09-15 14:51:57 -07:00
James Dong
27c4c1f6b0 Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread 2010-09-15 14:51:49 -07:00
Hung-ying Tyan
6393deaf98 am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp

* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
  Fixing the NPE in SipPhone
2010-09-15 13:06:30 -07:00
Hung-ying Tyan
8b419496df Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 2010-09-15 13:02:46 -07:00
Hung-ying Tyan
01a692c039 am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread
Merge commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a' into gingerbread-plus-aosp

* commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a':
  Fix links in SIP API javadoc.
2010-09-15 12:59:04 -07:00
Hung-ying Tyan
c29530252a Merge "Fix links in SIP API javadoc." into gingerbread 2010-09-15 12:56:36 -07:00
Mathias Agopian
2233643036 am f182e8a8: fix a typo where the eventtags code were wrong
Merge commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9' into gingerbread-plus-aosp

* commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9':
  fix a typo where the eventtags code were wrong
2010-09-15 12:53:59 -07:00
Mathias Agopian
6a3de9a424 fix a typo where the eventtags code were wrong
Change-Id: I517112a1475c10b71009a0aa9c3894c76a1f270f
2010-09-15 12:46:59 -07:00
Andreas Huber
6fc8c0d737 am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
Merge commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a' into gingerbread-plus-aosp

* commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a':
  Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
2010-09-15 11:28:18 -07:00
Andreas Huber
3b99f526d9 Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread 2010-09-15 11:25:40 -07:00
David Brown
62eff51f5c am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp

* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 11:15:14 -07:00
David Brown
47638c2d8e Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 2010-09-15 11:11:18 -07:00
Hung-ying Tyan
ee37919e76 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 07:42:48 -07:00
Hung-ying Tyan
bf7ee96973 am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp

* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
  SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 07:42:38 -07:00
Hung-ying Tyan
cccd77aa5b Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
d8af3ea549 Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Kenny Root
c3784ebfef am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
2010-09-14 18:04:53 -07:00
Kenny Root
5f47964493 Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
ecd0581146 am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
2010-09-14 17:48:30 -07:00
Steve Howard
7880a38a6e Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Chris Palmer
8fb81284c2 am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
d843af292e Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
John Wang
0cdb120b2a am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
  Complete event registration in CallManager.
2010-09-14 16:28:10 -07:00
John Wang
cdf8f7064e Merge "Complete event registration in CallManager." into gingerbread 2010-09-14 16:26:14 -07:00
Erik
3af74f9874 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Jeff Brown
4f5d8bf9a1 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jeff Brown
b06cca6228 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Mathias Agopian
5e4cf02dfe am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
2010-09-14 15:14:10 -07:00