ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,839 Commits 2 Branches 0 Tags 54 MiB
4afe8c4e7a
Commit Graph

17839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
4afe8c4e7a am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread 
Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp

* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
  Implement #2964234: Add support for <uses-package> element to aapt
 2010-09-02 17:36:37 -07:00
Dianne Hackborn
8bc525616e Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread 2010-09-02 17:34:31 -07:00
Kenny Root
1f5b98cb5b am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread 
Merge commit '2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp

* commit '2e2465497c08061cccf4908e49095f2d19a35eea':
  Add better debug output for ResourceType errors
 2010-09-02 15:48:49 -07:00
Kenny Root
6dfd218f7e Merge "Add better debug output for ResourceType errors" into gingerbread 2010-09-02 15:45:52 -07:00
Gilles Debunne
cc58f07eb4 am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
 2010-09-02 15:34:24 -07:00
Gilles Debunne
f1fa4addc5 Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 2010-09-02 15:29:14 -07:00
Eric Rowe
5f5cfede11 am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp

* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:59:00 -07:00
Kenny Root
45162448b3 Add better debug output for ResourceType errors 
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.

Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
 2010-09-02 14:58:47 -07:00
Gilles Debunne
e18c6ab92a am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread 
Merge commit '26d708d93624d2d060529b7e33e0a20172e85efd' into gingerbread-plus-aosp

* commit '26d708d93624d2d060529b7e33e0a20172e85efd':
  InputMethodManager showSoftInput return documentation.
 2010-09-02 14:55:51 -07:00
Eric Rowe
2c3659c42a am ac3c1f55: Add BT test instrumentation for reboot tests. 
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread

* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
  Add BT test instrumentation for reboot tests.
 2010-09-02 14:55:47 -07:00
Gilles Debunne
3d71a05eb6 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Eric Rowe
e31a4bd4b4 am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class. 
Merge commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe' into gingerbread-plus-aosp

* commit '3ac85d31de6cab5a468b7728b3340cf1b57bc8fe':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 14:30:45 -07:00
Eric Rowe
1ff3da4341 am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class. 
Merge commit '1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread

* commit '1314219a37403594f833c2c71744040ebd8d9b04':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 14:26:12 -07:00
Daisuke Miyakawa
d2629f01af am 3010713f: Fix again. 
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.
 2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
31dddb8af6 am 3bd9b8f0: Fix build breakage. 
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
 2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
cf437e4ef1 am b1f5a54a: Merge "VCard refactoring backport." into gingerbread 
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
 2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
3fb3a4fbd0 Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Laurent
fac8332612 am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread 
Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp

* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
  Fix problem in AudioEffect::command() status.
 2010-09-02 12:48:40 -07:00
Eric Laurent
a92ce71cf9 Merge "Fix problem in AudioEffect::command() status." into gingerbread 2010-09-02 12:46:24 -07:00
Jean-Baptiste Queru
10f091ece5 resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp 
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
 2010-09-02 12:05:33 -07:00
Eric Rowe
571c37bb7a am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp

* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
  DO NOT MERGE Separate utility methods into utility class.
 2010-09-02 11:37:51 -07:00
Eric Rowe
a9e23b3b62 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Xavier Ducrohet
1a7df62c01 Merge "Add a --debug-mode option to aapt." 2010-09-02 11:08:03 -07:00
Chia-chi Yeh
d764bb7a4b am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp

* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
  SipService: reduce the usage of javax.sdp.*.
 2010-09-02 08:17:11 -07:00
Chia-chi Yeh
d4d7550d22 Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Hung-ying Tyan
851a46069d am 60264b30: SipProfile: remove outgoingCallAllowed flag. 
Merge commit '60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp

* commit '60264b306453a3043442719b970f2edb3f46f51b':
  SipProfile: remove outgoingCallAllowed flag.
 2010-09-02 05:40:58 -07:00
Adam Powell
fad2382790 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
 2010-09-02 00:31:03 -07:00
Adam Powell
1b7a93030c Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Dianne Hackborn
58d1e77692 am a1c69e08: Fix a small bug when granting permissions through activity results. 
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp

* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
  Fix a small bug when granting permissions through activity results.
 2010-09-01 23:17:20 -07:00
Dianne Hackborn
c7da777a38 am d3efa392: Clean up some permissions. 
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
 2010-09-01 22:51:35 -07:00
Dianne Hackborn
d6382ba66f am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread 
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
  Improve messages when java process is starting.
 2010-09-01 21:18:31 -07:00
Dianne Hackborn
f1f5b58ce5 Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Jason Chen
d364339a9d am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
 2010-09-01 19:16:41 -07:00
Hung-ying Tyan
e6529a2f2b am 3424c02e: Add software features for SIP and VOIP 
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
 2010-09-01 18:01:31 -07:00
Andreas Huber
49b487e9ec am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 
Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp

* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
  Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
 2010-09-01 15:56:31 -07:00
James Dong
17bc56b6e6 am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
  Make sure that if initialization fails, AudioSource still behaves well.
 2010-09-01 15:56:25 -07:00
Andreas Huber
af538c26bc Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 2010-09-01 15:44:46 -07:00
James Dong
5171c04e5a Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 2010-09-01 15:41:10 -07:00
Dan Morrill
fd1fc2949c am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp

* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
  Adding a feature definition corresponding to support for Near-Field
 2010-09-01 15:05:34 -07:00
Dan Morrill
8bdbfa13b8 Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 2010-09-01 15:03:02 -07:00
Nick Kralevich
1b8ae0845d am 05f0382b: When dropping privileges, check return values. 
Merge commit '05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp

* commit '05f0382bcf11d96760ee8cf9110099a1661eed7c':
  When dropping privileges, check return values.
 2010-09-01 14:59:52 -07:00
Andreas Huber
49fb766c3c am 81f339bc: Merge "Fixing the build." into gingerbread 
Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp

* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
  Fixing the build.
 2010-09-01 14:53:12 -07:00
Kenny Root
09c74ae8e5 am 7c1bd7fd: Fix logic error in downgrade of system apps 
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp

* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
  Fix logic error in downgrade of system apps
 2010-09-01 14:52:54 -07:00
Andreas Huber
d937746ca5 Merge "Fixing the build." into gingerbread 2010-09-01 14:21:49 -07:00
Kenny Root
3cbdbbe405 am fca5677a: Merge "Add null check for package settings" into gingerbread 
Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp

* commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
  Add null check for package settings
 2010-09-01 14:12:26 -07:00
Kenny Root
f77ecb53c8 Merge "Add null check for package settings" into gingerbread 2010-09-01 14:09:01 -07:00
Adam Powell
623a30d5b6 am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp

* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
  DO NOT MERGE Integrate edge effects into WebView.
 2010-09-01 14:01:44 -07:00
Andreas Huber
71e8b83138 am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread 
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
 2010-09-01 13:57:44 -07:00
Adam Powell
f80fc12c88 Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 2010-09-01 13:57:05 -07:00
Andreas Huber
94d559b8fa Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread 2010-09-01 13:54:12 -07:00