27599 Commits

Author SHA1 Message Date
Mike Lockwood
53b0702755 am 727d67d4: Merge "location: rebind to network location and geocoder services after package update" into gingerbread
Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp

* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
  location: rebind to network location and geocoder services after package update
2010-09-30 13:10:50 -07:00
Mike Lockwood
727d67d4fb Merge "location: rebind to network location and geocoder services after package update" into gingerbread 2010-09-30 13:07:06 -07:00
Dianne Hackborn
c3bc8b7b08 am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread
Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp

* commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895':
  Fix night/notnight resource folder handling.
2010-09-30 12:43:55 -07:00
Dianne Hackborn
1bfbf19bd9 Merge "Fix night/notnight resource folder handling." into gingerbread 2010-09-30 12:40:52 -07:00
Mike Lockwood
e97ae40dff location: rebind to network location and geocoder services after package update
Change-Id: I2d7db3512b9edd7e0ba27d97442967fc2278e3b9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-30 15:25:54 -04:00
Paul Westbrook
5dcaf7b0b9 am fcf1948a: Moved Rfc822 validator test
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp

* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
  Moved Rfc822 validator test
2010-09-30 11:45:05 -07:00
Steve Howard
538c3fa35f am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Paul Westbrook
fcf1948aeb Moved Rfc822 validator test
Moved rfc822 validator test to framework/ex, as this is where
the code lives

Change-Id: Ia12e67364df9c8f9351dea423d769454a5d4e58d
2010-09-30 11:32:42 -07:00
Steve Howard
cdcc0a65fa Merge "Have download manager give more details when downloads are paused" into gingerbread 2010-09-30 11:11:16 -07:00
Wu-cheng Li
6bbc2f1562 am 2fb818ca: Fix the javadoc of Parameters.setRotation.
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp

* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
  Fix the javadoc of Parameters.setRotation.
2010-09-30 11:07:23 -07:00
Wu-cheng Li
2fb818ca7d Fix the javadoc of Parameters.setRotation.
setRotation needs to consider the orientation of cameras.
Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
2010-09-30 10:49:43 -07:00
Chia-chi Yeh
ab6327bc9a am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.
2010-09-30 10:11:16 -07:00
Chia-chi Yeh
2b133fc075 am 21ae1ad6: RTP: Minor fixes with polishing.
Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp

* commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
  RTP: Minor fixes with polishing.
2010-09-30 10:11:07 -07:00
Chia-chi Yeh
92cb1a026a am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp

* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
  KeyStore: Fix the return value when send() or recv() has an error.
2010-09-30 10:10:59 -07:00
Hung-ying Tyan
c79e74ec1d am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp

* commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6':
  Add uri field to SipManager.ListenerRelay
2010-09-30 10:10:52 -07:00
Chia-chi Yeh
f6381ec1da am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp

* commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720':
  RTP: Adjust the jitter buffer to 512ms.
2010-09-30 10:10:46 -07:00
Hung-ying Tyan
34552149e4 am 6a53489a: SipService: add UID check.
Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp

* commit '6a53489ae594d7cc373a00687d6ea2f23d0634df':
  SipService: add UID check.
2010-09-30 10:10:41 -07:00
Adam Powell
6e9a021e96 am bc87ada1: Merge "Fix text anchors" into gingerbread
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp

* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
  Fix text anchors
2010-09-30 10:10:34 -07:00
Jeff Brown
76d55a3447 am 5068ad8d: Revert orientation change.
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp

* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
  Revert orientation change.
2010-09-30 10:10:20 -07:00
Robert Greenwalt
aa03f13c3a am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread
Merge commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b' into gingerbread-plus-aosp

* commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b':
  Change the 0_fully signal icon to the new style
2010-09-30 10:10:14 -07:00
Jeff Brown
b8182a382d am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp

* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
  PointerLocationView: Display orientation correctly.
2010-09-30 10:10:09 -07:00
Chia-chi Yeh
cbee622954 am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread
Merge commit '0a537b78d3fb4db86411d745b2696459d6b98ef6' into gingerbread-plus-aosp

* commit '0a537b78d3fb4db86411d745b2696459d6b98ef6':
  RTP: Enable AMR codec.
2010-09-30 10:10:02 -07:00
Hung-ying Tyan
947d2abd82 am 2365b78e: Merge "SIP: misc fixes." into gingerbread
Merge commit '2365b78e64feaa9527efb15bf4ac207a837f2b45' into gingerbread-plus-aosp

* commit '2365b78e64feaa9527efb15bf4ac207a837f2b45':
  SIP: misc fixes.
2010-09-30 10:09:53 -07:00
Hung-ying Tyan
49c13e512c am 0e412304: Catch exceptions in SipPhone.canTake().
Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp

* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
  Catch exceptions in SipPhone.canTake().
2010-09-30 10:09:39 -07:00
Hung-ying Tyan
2c4573263a am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp

* commit '421c34c162098efe870574844a7ee49812bbb929':
  SipPhone: revise hangup() in SipCall and SipConnection.
2010-09-30 10:09:33 -07:00
Gilles Debunne
8064dd2265 am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp

* commit '71e2486209856d33d027389be2bd4924a03c4f86':
  New assets for status bar data_edge and overscroll
2010-09-30 10:08:38 -07:00
Ying Wang
3b197dfc7f am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp

* commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
  Fix proguard flag file dependency.
2010-09-30 09:33:19 -07:00
Chia-chi Yeh
20cb2310cf Merge "KeyStore: Initialize IV correctly." into gingerbread 2010-09-30 02:44:16 -07:00
Chia-chi Yeh
463d75b842 KeyStore: Initialize IV correctly.
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
2010-09-30 17:28:01 +08:00
Tobias Haamel
2b9785aa65 Fix night/notnight resource folder handling.
The values for NIGHT_NO / NIGHT_YES are shifted later on in the
ResourceTypes header file to match with the ones specified in the
Configuration class file. This is basically the same as it's done for
the SCREEN_LONG_NO / SCREEN_LONG_YES constants.

Since the values are also masked later on by 0x30 (MASK_UI_MODE_NIGHT)
the system currently recognizes resources specified in night/notnight
folders as if they were resources which can be used for any of both
modes. This results in an error saying that the resources are already
specified somewhere else.

Should fix: http://b/issue?id=3022577

Change-Id: I554b37231ea4c69a8625e519150473fddce7d8ed
2010-09-30 11:26:02 +02:00
Chia-chi Yeh
21ae1ad6a6 RTP: Minor fixes with polishing.
Change-Id: I50641373989e512fb489b5017edbcfd7848fe8b9
2010-09-30 16:07:44 +08:00
Chia-chi Yeh
2cbb56f961 Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 2010-09-30 00:39:32 -07:00
Chia-chi Yeh
c741a2fe41 KeyStore: Fix the return value when send() or recv() has an error.
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
2010-09-30 15:17:58 +08:00
Hung-ying Tyan
d29e075418 Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 2010-09-30 00:05:58 -07:00
Hung-ying Tyan
9e1d308e99 Add uri field to SipManager.ListenerRelay
in case mSession is not available.

Change-Id: Ifee2c129e48aa1177f648f176413ab6aa5606770
2010-09-30 15:00:34 +08:00
Chia-chi Yeh
dfd1484e3b Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 2010-09-29 23:24:32 -07:00
Chia-chi Yeh
3520bd4313 RTP: Adjust the jitter buffer to 512ms.
Change-Id: Ia91c1aa1a03b65dbd329ea98383f370844e2b0c0
2010-09-30 13:51:26 +08:00
Hung-ying Tyan
6a53489ae5 SipService: add UID check.
Only allow creator or radio user to access profiles.

Change-Id: I548938f117926bcc878419142d1b5d818a4e70df
2010-09-30 12:40:11 +08:00
Adam Powell
bc87ada10d Merge "Fix text anchors" into gingerbread 2010-09-29 21:05:12 -07:00
Adam Powell
ba0a2c383f Fix text anchors
Change-Id: Iddd5434a1dbeb1adc2143db73ed27df6b575319e
2010-09-29 21:02:19 -07:00
Jeff Brown
5068ad8d23 Revert orientation change.
Change-Id: I1a6d13be118533171b9a75025dcf7985dd7e12b5
2010-09-29 20:14:56 -07:00
Robert Greenwalt
e8dd716014 Merge "Change the 0_fully signal icon to the new style" into gingerbread 2010-09-29 19:48:57 -07:00
Jeff Brown
93e3296f94 Merge "PointerLocationView: Display orientation correctly." into gingerbread 2010-09-29 19:08:02 -07:00
Jeff Brown
707a57aa26 PointerLocationView: Display orientation correctly.
Canvas rotations are counterclockwise, orientation is clockwise,
so we need to mind the sign of the rotation.

Change-Id: I2a8b60599bd26e9dc3ced2e13942f846461333df
2010-09-29 18:41:11 -07:00
Chia-chi Yeh
0a537b78d3 Merge "RTP: Enable AMR codec." into gingerbread 2010-09-29 18:32:24 -07:00
Hung-ying Tyan
2365b78e64 Merge "SIP: misc fixes." into gingerbread 2010-09-29 18:12:12 -07:00
Chia-chi Yeh
f88fc1fa90 RTP: Enable AMR codec.
Change-Id: I49e6bdc1b67306b44173f2f346f8372a50264870
2010-09-30 08:55:12 +08:00
Steve Howard
3e8c1d3a46 Have download manager give more details when downloads are paused
This change introduces more detailed reporting of why downloads are paused in
the download manager.

First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED.  I've eliminated some dead code there as well to ease the
change.

Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED.  It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.

Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
2010-09-29 17:34:40 -07:00
Hung-ying Tyan
0e41230481 Catch exceptions in SipPhone.canTake().
Exceptions may throw during canTake() as the peer may cancel the call and
result in a race with this method call.

Change-Id: I61903d601d8f9b2dcb4c4fbe1586e2c1a1069109
http://b/issue?id=3033868
2010-09-30 08:30:36 +08:00
Hung-ying Tyan
421c34c162 SipPhone: revise hangup() in SipCall and SipConnection.
Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.

This should fix the bug:
http://b/issue?id=3027719

Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
2010-09-30 08:26:59 +08:00