ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,161 Commits 2 Branches 0 Tags 54 MiB
8869534faf
Commit Graph

21161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
9c391bdc9b Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread 2010-09-16 09:04:43 -07:00
Eric Laurent
a7eab2ec99 Merge "Fix problem in lvm effect bundle wrapper" into gingerbread 2010-09-16 09:04:37 -07:00
Joe Onorato
74acdc699b Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread 2010-09-16 09:02:35 -07:00
Steve Block
c8ea33f817 Merge "Make DumpRenderTree2 appear in the 'Dev Tools' application" 2010-09-16 04:59:28 -07:00
Hung-ying Tyan
07d4d6ce7b am f4fd88f8: am c7510581: SipService: add log control, suppress ping log. 
Merge commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3'

* commit 'f4fd88f8d8cacff718268b6349bcb8c6a28006f3':
  SipService: add log control, suppress ping log.
 2010-09-16 04:53:30 -07:00
Hung-ying Tyan
0adacd771a am c7510581: SipService: add log control, suppress ping log. 
Merge commit 'c7510581b81d63536db7d46ca8533106c8cf57c6' into gingerbread-plus-aosp

* commit 'c7510581b81d63536db7d46ca8533106c8cf57c6':
  SipService: add log control, suppress ping log.
 2010-09-16 04:50:25 -07:00
Chung-yih Wang
4e7177bdd1 am 170255b0: am d8f3d167: Add a new phone state ANSWERING. 
Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
  Add a new phone state ANSWERING.
 2010-09-16 04:48:15 -07:00
Chung-yih Wang
d2492e3da2 am d8f3d167: Add a new phone state ANSWERING. 
Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp

* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
  Add a new phone state ANSWERING.
 2010-09-16 04:45:44 -07:00
Chung-yih Wang
d2cd188936 am 1e27dc97: am 0e063382: Fix the unhandled authentication message. 
Merge commit '1e27dc978d5e929679f96eaed541c14b37cd1118'

* commit '1e27dc978d5e929679f96eaed541c14b37cd1118':
  Fix the unhandled authentication message.
 2010-09-15 23:35:37 -07:00
Chung-yih Wang
14354d4bac am 0e063382: Fix the unhandled authentication message. 
Merge commit '0e0633828928481658c0e09e5893f6214b57ba38' into gingerbread-plus-aosp

* commit '0e0633828928481658c0e09e5893f6214b57ba38':
  Fix the unhandled authentication message.
 2010-09-15 23:32:34 -07:00
Chet Haase
7bbf9bbb78 am 7ddff990: (-s ours) am 07980dc8: Merge "Adding new assets for designers" into gingerbread 
Merge commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf'

* commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf':
  Adding new assets for designers
 2010-09-15 21:53:07 -07:00
Jeff Brown
02a71f7ab4 am 7642c82c: am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread 
Merge commit '7642c82c291051919aad87c797e2dc1d77ed55e1'

* commit '7642c82c291051919aad87c797e2dc1d77ed55e1':
  Make input dispatcher only ANR for foreground windows.
 2010-09-15 21:42:28 -07:00
David Brown
9981df611b resolved conflicts for merge of 9c43fffc to master 
Change-Id: I6b5931bae7a9507b006c723db6c0b9589038e05c
 2010-09-15 21:30:12 -07:00
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 Hamilton
19d28f1077 Merge "Add new items to the BrowserContract." 2010-09-15 20:45:53 -07:00
Robert Greenwalt
8e45f7fcae am f434dd16: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread 
Merge commit 'f434dd1660f222a1ee85e77c98893b90857805c2'

* commit 'f434dd1660f222a1ee85e77c98893b90857805c2':
  Update Inet Connection Status display
 2010-09-15 19:49:53 -07:00
Chris Palmer
f32637aa7c am 1b60963c: am b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions. 
Merge commit '1b60963c42e159aacc52d688defcac206e5ecec0'

* commit '1b60963c42e159aacc52d688defcac206e5ecec0':
  Clarify the danger of READ_LOGS and DUMP permissions.
 2010-09-15 19:49:35 -07:00
Michael Jurka
a67c9bbf3c Merge "fixing bug where changing alpha on one textview changed alpha on all other textviews with the same drawable" 2010-09-15 19:44:29 -07:00
Andreas Huber
ac9cb9a5e5 am f8297ba0: am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread 
Merge commit 'f8297ba011af959331873e09612665a486e1a1a7'

* commit 'f8297ba011af959331873e09612665a486e1a1a7':
  Upgrade to the latest .webm project code.
 2010-09-15 19:11:10 -07:00
Wu-cheng Li
2703e29e49 am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change. 
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
  Fix the runtime restart due to name change.
 2010-09-15 19:11:05 -07:00
Erik
a8c89ee43e am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread 
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss
 2010-09-15 19:10:10 -07:00
Erik
079218f778 am 42e72e57: am 344d9663: Merge "Close tz query cursor when done." into gingerbread 
Merge commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6'

* commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6':
  Close tz query cursor when done.
 2010-09-15 19:10:04 -07:00
Chet Haase
97dd453ae5 am 5ae52f68: (-s ours) am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread 
Merge commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267'

* commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267':
  Add new/changed drawable assets from design team
 2010-09-15 19:09:59 -07:00
Wu-cheng Li
e360c2aedb am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread 
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'

* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
  Update camera API and javadoc for API review comments.
 2010-09-15 19:03:01 -07:00
James Dong
281089f814 am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread 
Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'

* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
  Add some explicit error log messages
 2010-09-15 19:02:45 -07:00
James Dong
300df16cac am beb55f57: am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread 
Merge commit 'beb55f572fd217174ebf8f6679792a6b22896645'

* commit 'beb55f572fd217174ebf8f6679792a6b22896645':
  Fix audio input sample timestamp when audio driver loses audio samples
 2010-09-15 19:02:39 -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
Romain Guy
612b658023 Merge "Fix 9patch rendering." 2010-09-15 18:15:10 -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
Hung-ying Tyan
2f87fb14b3 am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 
Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'

* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
  Fixing the NPE in SipPhone
 2010-09-15 17:54:01 -07:00
Hung-ying Tyan
d63f92b389 am 6962aff3: am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread 
Merge commit '6962aff36be9d91ad40ead326bd54fc90965f6f0'

* commit '6962aff36be9d91ad40ead326bd54fc90965f6f0':
  Fix links in SIP API javadoc.
 2010-09-15 17:53:53 -07:00
Mathias Agopian
3fd1ed5938 am 310da64d: am f182e8a8: fix a typo where the eventtags code were wrong 
Merge commit '310da64d78750cdba4349d7cc0a268c07155569d'

* commit '310da64d78750cdba4349d7cc0a268c07155569d':
  fix a typo where the eventtags code were wrong
 2010-09-15 17:53:43 -07:00
Andreas Huber
c24587cba9 am 7ff94577: am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread 
Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'

* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
  Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
 2010-09-15 17:53:17 -07:00
David Brown
b683612d2a am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'

* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
 2010-09-15 17:43:34 -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
James Dong
b2a53d131b Merge "Fix potential unintialized variable yuvformat" 2010-09-15 17:04:15 -07:00
Hung-ying Tyan
db3465e076 am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'

* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 16:47:30 -07:00
Hung-ying Tyan
d805e332c1 am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread 
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'

* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
  SipService: send SERVER_ERROR if server doesn't provide nonce
 2010-09-15 16:47:22 -07:00
Kenny Root
3171c71b0c am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread 
Merge commit '79a1ee4249aadc84558dad2e275b8edde198da76'

* commit '79a1ee4249aadc84558dad2e275b8edde198da76':
  Free AssetManager weak refs before unmounting
 2010-09-15 16:32:45 -07:00
Steve Howard
a6a57052cf am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'

* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
  Fix name shadowing bug with revoking URI permissions.
 2010-09-15 16:32:30 -07:00
Chris Palmer
7c5c4e512b am c5e2e26b: (-s ours) am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'

* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
 2010-09-15 16:32:18 -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