Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,354 Commits 3 Branches 0 Tags
4ca550a17b8becdf6b5a32909fb5c70ef7579f4e
Commit Graph

26354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Rowe
4ca550a17b 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
Gilles Debunne
5402c34b27 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
947e25e5ff 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
26d708d936 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Eric Rowe
78495f8ccf 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
3ac85d31de 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
fa5a46a08e 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
3010713f50 Fix again. 
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
 2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
b2b973d13e 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
3bd9b8f04c Fix build breakage. 
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
 2010-09-02 13:42:22 -07:00
Daisuke Miyakawa
22a17ce60b 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
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Laurent
937056c1a7 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
32ec1ad17f Merge "Fix problem in AudioEffect::command() status." into gingerbread 2010-09-02 12:46:24 -07:00
Jean-Baptiste Queru
d0743dfbee resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp 
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
 2010-09-02 12:05:33 -07:00
Eric Laurent
e65280c552 Fix problem in AudioEffect::command() status. 
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.

Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
 2010-09-02 11:56:55 -07:00
Eric Rowe
6aa717e4a1 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
97e58ef444 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Eric Rowe
13438b0205 DO NOT MERGE Separate utility methods into utility class. 
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close().  The constructor
is derived from setUp() and close() from tearDown().

Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
 2010-09-02 11:29:59 -07:00
Xavier Ducrohet
bd6abed3c8 Merge "Add a --debug-mode option to aapt." 2010-09-02 11:08:03 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport. 
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
 2010-09-02 10:39:00 -07:00
Chia-chi Yeh
12eaf9d50c 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
dc296b0d4b Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Chia-chi Yeh
95b15c3560 SipService: reduce the usage of javax.sdp.*. 
After this change, SipAudioCallImpl is the only place still using it.

Change-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb
 2010-09-02 22:15:26 +08:00
Hung-ying Tyan
18dfae226b 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
Hung-ying Tyan
60264b3064 SipProfile: remove outgoingCallAllowed flag. 
Change-Id: I37a215bafce57adf6911c81fd38db324bac686ec
 2010-09-02 20:34:17 +08:00
Adam Powell
0358def776 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
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks. 
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
 2010-09-02 00:14:53 -07:00
Dianne Hackborn
75823339cd 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
a1c69e084b Fix a small bug when granting permissions through activity results. 
Change-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174
 2010-09-01 22:55:02 -07:00
Dianne Hackborn
840f0fecd8 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
d3efa39244 Clean up some permissions. 
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
 2010-09-01 21:19:40 -07:00
Dianne Hackborn
14d56840ee 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
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Dianne Hackborn
08e60f2a16 Improve messages when java process is starting. 
Change-Id: I33e401eb240a454845987c10d44e3520e419721b
 2010-09-01 19:17:47 -07:00
Jason Chen
9fadca71e4 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
Jason Chen
b766ab830a DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.

Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
 2010-09-01 19:04:18 -07:00
Hung-ying Tyan
3e4975a52c 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
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP 
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
 2010-09-02 08:10:13 +08:00
Andreas Huber
fd0eed007d 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
3fd01c4da9 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
a2511da9d6 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
d3c1bae4eb Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 2010-09-01 15:41:10 -07:00
Dan Morrill
61f1cbdd71 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
Andreas Huber
4d8f66bce3 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. 
Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
 2010-09-01 15:05:28 -07:00
Dan Morrill
a800a2efa2 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
b4de2f9975 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
4fd76ba227 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
9088a3d153 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