27122 Commits

Author SHA1 Message Date
Erik
bfbab8ca36 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
42e72e570b 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
a8cc20e5fb Merge "b/3004029 Fixed content resolver loss" into gingerbread 2010-09-15 15:51:53 -07:00
Erik
344d96635e Merge "Close tz query cursor when done." into gingerbread 2010-09-15 15:51:37 -07:00
Erik
09bd4bf85e b/3004029 Fixed content resolver loss
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.

Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
2010-09-15 15:45:19 -07:00
Chet Haase
5ae52f68cf 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
8f385affaf Merge "Add new/changed drawable assets from design team" into gingerbread 2010-09-15 15:33:31 -07:00
Chet Haase
0183e3bd5d Add new/changed drawable assets from design team
Change-Id: I8b2274357e41093e120bee42272026446e94872d
2010-09-15 15:27:25 -07:00
Andreas Huber
e5f853911c Upgrade to the latest .webm project code.
Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
2010-09-15 15:13:16 -07:00
Wu-cheng Li
4db458b4f7 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
a6f4149596 Merge "Update camera API and javadoc for API review comments." into gingerbread 2010-09-15 14:57:59 -07:00
James Dong
0cd2472bf8 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
beb55f572f 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
82a39f4aab Merge "Add some explicit error log messages" into gingerbread 2010-09-15 14:51:57 -07:00
James Dong
9f882c0b10 Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread 2010-09-15 14:51:49 -07:00
Wu-cheng Li
7836660f5e Update camera API and javadoc for API review comments.
bug:3001395
bug:3001399
Change-Id: I7030c4eff94ab11f44b862e8c206fb69a4e5c428
2010-09-15 14:47:37 -07:00
Erik
5ba5de93c7 Close tz query cursor when done.
Change-Id: I9cb30539b12121f01e093985985e3c802f7a9e8c
2010-09-15 13:37:19 -07:00
Hung-ying Tyan
1e563f9118 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
968735e580 Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 2010-09-15 13:02:46 -07:00
Hung-ying Tyan
6962aff36b 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
698ddb0cd6 Merge "Fix links in SIP API javadoc." into gingerbread 2010-09-15 12:56:36 -07:00
Mathias Agopian
310da64d78 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
Hung-ying Tyan
286bb5a00b Fix links in SIP API javadoc.
Change-Id: I839280fe18502bb576f6e9c9a7948077c02fa570
2010-09-16 03:52:10 +08:00
Mathias Agopian
f182e8a8c2 fix a typo where the eventtags code were wrong
Change-Id: I517112a1475c10b71009a0aa9c3894c76a1f270f
2010-09-15 12:46:59 -07:00
Steve Howard
eca77fcdc6 Support new URI structure for download provider.
I'm changing the URI structure for the download provider a bit.  The
download provider will now support two views into its data:

* content://downloads/my_downloads... will basically be the current
  view, which is limited to downloads owned by the calling UID
* content://downloads/all_downloads... will include all downloads in
  the system, but will require special permission

In addition to making things more clear, this change will allow for
granting URI permissions to individual downloads via the
/all_downloads/... URI.

This change includes the framework changes necessary to support the
new structure.  The bulk of the work will be in the DownloadProvider
code itself.

In addition, this change makes DownloadManager return a content URI
rather than a file URI for /cache downloads.  This avoids any
confusion in clients, which wouldn't be able to open the file
directly, and better supports granting permissions to viewers.

Change-Id: Ie548b927817ac774111990dd0c9d26aaf979d1ea
2010-09-15 12:28:31 -07:00
Andreas Huber
7ff9457752 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
9909b948ac 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
Andreas Huber
f3d2bdf73c Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
Change-Id: Idbec5996ed0675c70e911b9c0514961fea099fb4
2010-09-15 11:18:13 -07:00
David Brown
0237cf2eac 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
8626d1a336 Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 2010-09-15 11:11:18 -07:00
Hung-ying Tyan
8a33e964c4 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
8d9e8de2c9 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
Chung-yih Wang
94e498332a Fixing the NPE in SipPhone
bug id: http://b/2987816

Change-Id: Iee252eee0a5243b70ff0b6f287279f92235b5b2d
2010-09-15 19:39:01 +08:00
Hung-ying Tyan
5306e0a85d Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
096df8197b Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Jeff Brown
dc1ab4b5cc Input API review.
Drop currently unsupported input features.
Add documentation comments.

Change-Id: I407d2e1dd90c5ee82983a3ccf177430d35ee7592
2010-09-14 20:46:14 -07:00
Hung-ying Tyan
ae076d3981 SIP: add PEER_NOT_REACHABLE error feedback.
http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
2010-09-15 11:30:45 +08:00
Kenny Root
79a1ee4249 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
cee0b97eed Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
d2de99e377 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
536ee090ef Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Chris Palmer
c5e2e26b9d 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
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
Steve Howard
0de8ddb0cf Fix name shadowing bug with revoking URI permissions.
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
2010-09-14 16:29:26 -07:00
John Wang
8028bd5b69 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
6457a28be8 Merge "Complete event registration in CallManager." into gingerbread 2010-09-14 16:26:14 -07:00
David Brown
f4ece2086f Mark MODIFY_PHONE_STATE permission as signatureOrSystem
This permission isn't needed right now, since there aren't actually any
public APIs that require it.  (There are a few calls in the ITelephony
interface that do, but they're all hidden.)

Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now.  We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).

Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
2010-09-14 16:19:31 -07:00
Erik
0b46070d88 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
Erik
426ee7f22e Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.

Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
2010-09-14 16:08:55 -07:00
John Wang
59f9bae81d Complete event registration in CallManager.
1. Originally CallManager registers for all phone events provided by registerFor interface,

which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."

for CDMA only events. Register for those events only if phone is CDMA phone.

2. Add registerForPostDialCharacter().

Note, we can't use notifyRegistrants() in handler since we need send

the character that is being processed in msg.arg1.

Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
2010-09-14 16:01:50 -07:00