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

21076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Romain Guy
612b658023 Merge "Fix 9patch rendering." 2010-09-15 18:15:10 -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
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
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
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
Jim Miller
28be19cb98 Merge "Add new Carousel callbacks to RecentApplicationsActivity." 2010-09-15 14:53:05 -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
Paul Westbrook
33f4c675be Merge "Enable downloads of https urls" 2010-09-15 14:23:28 -07:00
Makoto Onuki
8231fc9f9c Merge "Add AbstractCursor.getNotificationUri." 2010-09-15 13:34:05 -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
Joe Onorato
b5d062e233 Merge "fix the build." 2010-09-15 12:36:21 -07:00
John Wang
ec921a5780 am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread 
Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b'

* commit '8028bd5b696fd94d33c905c4279d6505e985d70b':
  Complete event registration in CallManager.
 2010-09-15 12:33:19 -07:00
Erik
50c9af2b4a am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils 
Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'

* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
  Fixes some bugs in TimeZoneUtils
 2010-09-15 12:32:46 -07:00
Jeff Brown
dc543aec70 am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
  Replace epoll() with poll() and rename PollLoop to Looper.
 2010-09-15 12:32:29 -07:00
Mathias Agopian
c479e18db0 resolved conflicts for merge of 48a86240 to master 
Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5
 2010-09-15 12:29:18 -07:00
jsh
ee6d0ecd57 am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 
Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'

* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
  Unhide GsmCellLocation.getPsc().
 2010-09-15 12:19:05 -07:00
Eric Laurent
37568e9fd2 am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread 
Merge commit '23b8054e85eaffa515c597e7b386e3892968302d'

* commit '23b8054e85eaffa515c597e7b386e3892968302d':
  Added intents for audio effects control application
 2010-09-15 11:39:09 -07:00
Dianne Hackborn
5b1a7245a3 am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'

* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
  Fix problem where power manager was calling battery stats with bad wl type.
 2010-09-15 11:38:47 -07:00
Erik
a9ae6b680a am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread 
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'

* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
  Adds time zone functionality into fw as a hidden api
 2010-09-15 11:38:26 -07:00
Dianne Hackborn
8346fa498a am 264e7277: am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread 
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'

* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
  Fix issue #2999795: Runtime restart on Crespo
 2010-09-15 11:38:02 -07:00
Brad Fitzpatrick
898171bbd3 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
 2010-09-15 11:37:54 -07:00
Brad Fitzpatrick
03b02e1d88 am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread 
Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'

* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
  Add missing wallpaper service lock.
 2010-09-15 11:37:46 -07:00
Romain Guy
04c64dc3e5 am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread 
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'

* commit '282315e154b63a2eec84609600c81ad9e1c72994':
  Change the keep alive time for excess idle threads.
 2010-09-15 11:37:37 -07:00
Brian Carlstrom
6bd6d21962 am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters 
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'

* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
 2010-09-15 11:37:22 -07:00