58225 Commits

Author SHA1 Message Date
Robert Ly
e9f384d6e9 am ba812693: cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
* commit 'ba8126938e8ec82502e9db9594ef7036fa4a4b13':
  cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
2011-08-30 10:26:02 -07:00
Robert Ly
ba8126938e cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e
docs: ndk r6b rel notes

Change-Id: I3512f11370ddbfbe6c70efe59f216b5c4ea84ae7
2011-08-30 10:19:40 -07:00
Tsu Chiang Chuang
78adccbe02 am 67112061: Merge "Adding bandwidth enforcement test app."
* commit '67112061b2a68e4e6f76fb45f7a2285925d6b1cb':
  Adding bandwidth enforcement test app.
2011-08-30 10:14:08 -07:00
Tsu Chiang Chuang
67112061b2 Merge "Adding bandwidth enforcement test app." 2011-08-30 10:12:44 -07:00
Mike Lockwood
97bbefac0c Merge "Make Serial Manager APIs public" into ics-aah 2011-08-30 10:01:05 -07:00
Mike Lockwood
20b31a945e Merge "Quick and dirty test app for new SerialPort API" into ics-aah 2011-08-30 09:59:33 -07:00
Mike Lockwood
a72177a4e8 Merge "New Serial Manager API:" into ics-aah 2011-08-30 09:59:19 -07:00
Mike Lockwood
1bf3c4bba2 Make Serial Manager APIs public
Change-Id: I9b96ff288a4757c4c4465a6a5ea3b4ed9c432e06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:33 -04:00
Mike Lockwood
b6d80cf126 Quick and dirty test app for new SerialPort API
Change-Id: Ie1ae6e7387b9f1e2788b798de29a06d551a44d1d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:33 -04:00
Mike Lockwood
8b3b98d622 New Serial Manager API:
SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports

IO with both array based and direct ByteBuffers is supported.

Accessing serial ports requires android.permission.SERIAL_PORT permission

Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).

In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.

Change-Id: I6afa78ceacf08486aaebced4156ecd2e33051879
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 12:56:26 -04:00
Narayan Kamath
777a1254ea am 5cdc720d: Merge "Don\'t allow TTS engines to synthesize too for ahead."
* commit '5cdc720dcadaa517766abb8a2f176de1a78a26a8':
  Don't allow TTS engines to synthesize too for ahead.
2011-08-30 09:54:49 -07:00
Narayan Kamath
5cdc720dca Merge "Don't allow TTS engines to synthesize too for ahead." 2011-08-30 09:52:06 -07:00
Gilles Debunne
02242b9db6 am ce4afc14: Merge "Moving action popup window when moving text selection"
* commit 'ce4afc1425cf74b7168a2d3d35c54efe9b5c98af':
  Moving action popup window when moving text selection
2011-08-30 09:49:31 -07:00
Gilles Debunne
2ae8410d4b am 4cbcc2bc: Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language"
* commit '4cbcc2bc06cb228c2c5374920d2d4038685de8a6':
  Bug 5218421: new NPE is SpellChecker when using Japanese language
2011-08-30 09:47:30 -07:00
Gilles Debunne
ce4afc1425 Merge "Moving action popup window when moving text selection" 2011-08-30 09:46:30 -07:00
Gilles Debunne
4cbcc2bc06 Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language" 2011-08-30 09:45:46 -07:00
Jean-Michel Trivi
6d61bf8576 am c5d0fac0: Merge "Bug 5156756 Fix AAC ADTS header size computation"
* commit 'c5d0fac081c4c496b29586bff79dfff05755b716':
  Bug 5156756 Fix AAC ADTS header size computation
2011-08-30 09:08:02 -07:00
Jean-Michel Trivi
c5d0fac081 Merge "Bug 5156756 Fix AAC ADTS header size computation" 2011-08-30 09:06:36 -07:00
Mike Lockwood
b9797b08f4 am 7c267b24: Merge "Extinguish notification LED when user passes through lock screen"
* commit '7c267b24c69685ee623efb61bd98707869e92f5d':
  Extinguish notification LED when user passes through lock screen
2011-08-30 08:47:21 -07:00
Mike Lockwood
7c267b24c6 Merge "Extinguish notification LED when user passes through lock screen" 2011-08-30 08:46:18 -07:00
Mike Lockwood
63b5ad9e17 Extinguish notification LED when user passes through lock screen
Also do not blink for notifications received when the screen is on.

Bug: 5233071

Change-Id: I15675ca317007d4b900ef74e60d11a5bca3d7333
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-30 09:55:30 -04:00
Svetoslav Ganov
0ca6a6cde0 am 173cc7c8: Merge "Adding accessibility support to the slide lock screen"
* commit '173cc7c86a7226e4167b2c0626a97d57aaca0d0a':
  Adding accessibility support to the slide lock screen
2011-08-29 22:11:52 -07:00
Svetoslav Ganov
173cc7c86a Merge "Adding accessibility support to the slide lock screen" 2011-08-29 22:09:56 -07:00
Svetoslav Ganov
f058340b2f Adding accessibility support to the slide lock screen
bug:5210233

Change-Id: I93e876524ae6aaf75aadbe6a21c5c17d41a705f0
2011-08-29 22:01:44 -07:00
Rajneesh Chowdury
516affc103 am 90200ee4: Merge "5106773 Can\'t export a movie - Error returned from OMX API in ducati"
* commit '90200ee4e23b662e81a8d6fb6ef634ac6b378f5f':
  5106773 Can't export a movie - Error returned from OMX API in ducati
2011-08-29 20:45:06 -07:00
Rajneesh Chowdury
90200ee4e2 Merge "5106773 Can't export a movie - Error returned from OMX API in ducati" 2011-08-29 20:43:11 -07:00
Rajneesh Chowdury
8f7bf02506 5106773 Can't export a movie - Error returned from OMX API in ducati
Video Editor engine wrongly set the profile in place of level.
So level was always 1 (default value for Profile)

Change-Id: I202f866d32e81869d9692174d59d9d777a772282
2011-08-29 20:16:22 -07:00
Jeff Sharkey
d712530185 am 4107beec: Merge "Introduce immediate CONNECTIVITY_ACTION variant."
* commit '4107beecaab18b393e56a0c34b333f0a6e15be2f':
  Introduce immediate CONNECTIVITY_ACTION variant.
2011-08-29 20:01:46 -07:00
Jeff Sharkey
4107beecaa Merge "Introduce immediate CONNECTIVITY_ACTION variant." 2011-08-29 20:00:12 -07:00
Jean-Michel Trivi
59fe406b3a Bug 5156756 Fix AAC ADTS header size computation
This previous frame size computation code had two incorrect
 assumptions:
 1/ the ADTS frame length value already contains the header size
 2/ the ADTS header is not of fixed size: it is 2 bytes bigger
  if it contains the CRC value.
For 1/, the code worked because when the header size was added
 to the frame size, the + operator is of stronger precedence
 than the ? operator, so the size added was always 0 (instead
 of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
 data.

The fix consists in:
 - documenting what the frame length computation code returns
 - fixing the frame length computation
 - when computing the frame length, also returning the header
  size so the correct data can be sent to the decoder.

Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
2011-08-29 18:56:55 -07:00
Dianne Hackborn
efc1b3b4d9 am 42930641: Merge "Fix issues 5158104 and 4981556 (fragment problems)"
* commit '42930641792ecd23fee6b2913ba1e7cf24634f3d':
  Fix issues 5158104 and 4981556 (fragment problems)
2011-08-29 18:42:29 -07:00
Dianne Hackborn
4293064179 Merge "Fix issues 5158104 and 4981556 (fragment problems)" 2011-08-29 18:40:21 -07:00
Jim Miller
3a34149c13 am 476769b4: Merge "Fix 5044158: Integrate music transport control into LockScreen"
* commit '476769b42f38ebf943ea859d98faa94fdc38eec1':
  Fix 5044158: Integrate music transport control into LockScreen
2011-08-29 18:32:42 -07:00
Jim Miller
476769b42f Merge "Fix 5044158: Integrate music transport control into LockScreen" 2011-08-29 18:30:44 -07:00
Jim Miller
1c18828d20 Fix 5044158: Integrate music transport control into LockScreen
This integrates a new version of TransportControlView into LockScreen
and adds plumbing to handle new AudioService events to show/hide the view
and updates the required assets for all devices.

Updated to use new AudioManager API. Since the current API only supports
one RCD, the handler now lives in TransportControlView.

Change-Id: I220d4dd760bef35bd84209adc3c5829bf5bc9a2c
2011-08-29 18:29:21 -07:00
Christopher Tate
5e72362245 am 37656214: Merge "Un-hide the new BackupAgent.onFullBackup() API"
* commit '376562143436353bbd745d3cce413f649a09dda8':
  Un-hide the new BackupAgent.onFullBackup() API
2011-08-29 18:13:50 -07:00
Christopher Tate
3765621434 Merge "Un-hide the new BackupAgent.onFullBackup() API" 2011-08-29 18:11:38 -07:00
Dianne Hackborn
6c285977a0 Fix issues 5158104 and 4981556 (fragment problems)
5158104: com.android.contacts: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState at
android.app.FragmentManagerImpl.checkStateLoss(FragmentManager.java:1201)

The ViewPager can just commit without worrying about a state loss,
since it can correctly reconstruct its state later.

4981556: Fragment.mImmediateActivity doesn't get restored on orientation change

I am giving up on this thing; I just don't see how it can actually
be correct.  So now instead of getting an exception about a dup
add/remove at point of the add/remove call, this will happen later when
processing the transaction.

Also add an API for controlling the visibility of menus, which ViewPager
can use to have the correct menus shows.  And add a method to get the
name of a back stack entry.

Change-Id: Idcba14cfa2a172545a7a2a2c466cb49ceb789619
2011-08-29 17:58:17 -07:00
Irfan Sheriff
8a7e28ede6 am f99360bf: Merge "Initialize p2p settings"
* commit 'f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89':
  Initialize p2p settings
2011-08-29 17:38:33 -07:00
Irfan Sheriff
f99360bf8f Merge "Initialize p2p settings" 2011-08-29 17:36:50 -07:00
John Reck
ce9b2d9218 am 30cca602: Merge "Fix contentInvalidateAll NPE"
* commit '30cca6020df6fede4043a9f6715be470d3132c57':
  Fix contentInvalidateAll NPE
2011-08-29 17:16:14 -07:00
John Reck
30cca6020d Merge "Fix contentInvalidateAll NPE" 2011-08-29 17:14:11 -07:00
Matthew Xie
cae4ce1f6d am d56b3c95: Merge "Move Bluetooth remove service record handler to the app main thread"
* commit 'd56b3c952469a63aa9d4fc860be24b80a4b0e3b6':
  Move Bluetooth remove service record handler to the app main thread
2011-08-29 16:34:05 -07:00
Jim Miller
c1a9ce0b70 am f0eb7655: Merge "Fix 5044158: Reduce overall memory footprint of lockscreen"
* commit 'f0eb7655ac897ca06034296f7674b73a65f0e8a9':
  Fix 5044158: Reduce overall memory footprint of lockscreen
2011-08-29 16:33:51 -07:00
Daniel Lehmann
127ebfd8a0 am 82e0c6f3: Merge "Add the lookup_key column, which should have been in the previous CL"
* commit '82e0c6f3dec5c7359166b9ff720f9fcc8c6801d7':
  Add the lookup_key column, which should have been in the previous CL
2011-08-29 16:33:38 -07:00
Wink Saville
b8ded63007 am 03605fa8: Merge "Fix leak in SIM ready registrants"
* commit '03605fa832ea42dedca00fc7798a6da6c8a6c8a3':
  Fix leak in SIM ready registrants
2011-08-29 16:33:30 -07:00
James Dong
a273d4fe3f am 2a451021: Merge "The test application falsely reports that the test result even if the test failed."
* commit '2a45102186a25877df04404d591171b2b2e85626':
  The test application falsely reports that the test result even if the test failed.
2011-08-29 16:33:14 -07:00
Irfan Sheriff
f7ecb1aff4 am 335e40c0: Merge "Use seperate config file for p2p"
* commit '335e40c0f1c3aec550e61fa159130527fda597b6':
  Use seperate config file for p2p
2011-08-29 16:33:00 -07:00
Jason Simmons
b147e3e6e1 Merge "resolved conflicts for merge of 35c0bf31 to ics-aah" into ics-aah 2011-08-29 16:31:23 -07:00
Matthew Xie
d56b3c9524 Merge "Move Bluetooth remove service record handler to the app main thread" 2011-08-29 16:27:54 -07:00