Commit Graph

18671 Commits

Author SHA1 Message Date
Kenny Root
8e468f17e5 am 735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp

* commit '735de3b38abbd6564082a819377673ee593744a6':
  Hash keys with MD5; track IBinders not IInterface
2010-09-30 17:30:37 -07:00
Kenny Root
34f447289b am 27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '27358a69b33eaa268ee75ef778ec824c8085adcc' into gingerbread-plus-aosp

* commit '27358a69b33eaa268ee75ef778ec824c8085adcc':
  Only allow 8 OBBs to be mounted by a UID
2010-09-30 17:30:33 -07:00
Kenny Root
3598515301 am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
2010-09-30 17:30:22 -07:00
Hung-ying Tyan
6e6b48f7e8 am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread
Merge commit '063d02bb03a9260314b529490866528433148738' into gingerbread-plus-aosp

* commit '063d02bb03a9260314b529490866528433148738':
  SipService: turn off verbose logging
2010-09-30 17:25:30 -07:00
Steve Howard
348a2fd32a am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp

* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
  Avoid NPE when viewing failed legacy download with no local path
2010-09-30 17:22:35 -07:00
Hung-ying Tyan
9e03f93304 Merge "SipService: turn off verbose logging" into gingerbread 2010-09-30 17:20:25 -07:00
Jake Hamby
8c14ddd7bc resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
2010-09-30 16:29:13 -07:00
Steve Howard
77b23794f8 Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread 2010-09-30 16:22:58 -07:00
Jeff Brown
5076311956 am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Merge commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0' into gingerbread-plus-aosp

* commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0':
  Move verbose logging of device capabilities to dumpsys.
2010-09-30 15:57:29 -07:00
Eric Fischer
c2b33157f1 am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp

* commit '194f524456ebecbe13180146160a9b177cfb6be1':
  Import revised translations.  DO NOT MERGE
2010-09-30 15:54:26 -07:00
Jake Hamby
514c70a790 Merge "Typo fixes in comments and minor code cleanups." into gingerbread 2010-09-30 15:47:34 -07:00
Jeff Brown
39e1275d2b Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread 2010-09-30 15:46:00 -07:00
Eric Fischer
dd8fa072b0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:44:54 -07:00
Jeff Brown
26c94ff615 Move verbose logging of device capabilities to dumpsys.
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
2010-09-30 15:34:48 -07:00
Kenny Root
1635e522e0 am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
2010-09-30 14:30:14 -07:00
Kenny Root
9e681f5374 Merge "Fix location of gdbserver upon installation" into gingerbread 2010-09-30 14:27:15 -07:00
Mike Lockwood
06ddd4c77f 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
33756f1947 Merge "location: rebind to network location and geocoder services after package update" into gingerbread 2010-09-30 13:07:06 -07:00
Dianne Hackborn
df5b6d9694 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
23beef51fd Merge "Fix night/notnight resource folder handling." into gingerbread 2010-09-30 12:40:52 -07:00
Paul Westbrook
72409a4a0b 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
b5543cde51 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
Steve Howard
db6a8843ef Merge "Have download manager give more details when downloads are paused" into gingerbread 2010-09-30 11:11:16 -07:00
Wu-cheng Li
2cb06ac028 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
Chia-chi Yeh
5b0de90f96 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
06d4a936de 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
f3e1e2b617 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
eced15c440 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
52dd08bb76 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
726d8d503b 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
f9f60b3866 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
71e6917bbc 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
6735e36252 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
e16bb02a38 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
4dca7ba98a 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
dbe52c0a08 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
45c9dae7f0 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
3d9bb61170 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
3a716dfd06 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
2aa9489fea 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
670a23f493 Merge "KeyStore: Initialize IV correctly." into gingerbread 2010-09-30 02:44:16 -07:00
Chia-chi Yeh
857edec1a2 KeyStore: Initialize IV correctly.
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
2010-09-30 17:28:01 +08:00
Chia-chi Yeh
18fc21daf5 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
1c2eccfac3 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
263ab1cd7d Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 2010-09-30 00:05:58 -07:00
Chia-chi Yeh
ebbc6372b2 Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 2010-09-29 23:24:32 -07:00
Adam Powell
a5e76f4d4b Merge "Fix text anchors" into gingerbread 2010-09-29 21:05:12 -07:00
Robert Greenwalt
e88b133a3b Merge "Change the 0_fully signal icon to the new style" into gingerbread 2010-09-29 19:48:57 -07:00
Jeff Brown
79d3af4a2f Merge "PointerLocationView: Display orientation correctly." into gingerbread 2010-09-29 19:08:02 -07:00
Chia-chi Yeh
ba90c5ba8f Merge "RTP: Enable AMR codec." into gingerbread 2010-09-29 18:32:24 -07:00