112549 Commits

Author SHA1 Message Date
Kenny Root
0611f47721 am 90e42717: Merge changes I5d2be3c5,I9017256b
* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
2013-09-10 11:52:16 -07:00
Kenny Root
90e42717e5 Merge changes I5d2be3c5,I9017256b
* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
2013-09-10 18:50:02 +00:00
Kenny Root
0b83f9c805 Add argument to binder call to check key types
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit b91773bce1126d28a93f73fbef18f3a79245f24e)

Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
2013-09-10 18:49:40 +00:00
Chet Haase
9f7136e963 am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev
* commit '59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
  Fix for transition layout suppression
2013-09-10 11:47:15 -07:00
Adam Powell
218b116344 am 6a221b3f: Fix some bizarre Spinner behavior
* commit '6a221b3f85fbe7cbfbd11b9eeb672baca27faec2':
  Fix some bizarre Spinner behavior
2013-09-10 11:47:12 -07:00
Chet Haase
59b7a4ec9c Merge "Fix for transition layout suppression" into klp-dev 2013-09-10 18:44:21 +00:00
Adam Powell
6a221b3f85 Fix some bizarre Spinner behavior
* Make sure the recycler is cleared when the adapter is changed.
  Bug 10689596

* Don't add views to measure the baseline.
  Bug 10690353

Change-Id: I841dc05652eef3319721631f96332f7900d1a631
2013-09-10 11:38:52 -07:00
Chet Haase
a56205c485 Fix for transition layout suppression
The ChangeBounds transition causes its target view parents to suppress
layout for the duration of the transition. This is done to avoid artifacts
caused by running layout while layout bounds are being animated between
different scene values.

In order to react correctly to new transition/scene information (such as
running a new transition while another is already running), the transition
system calls pause() on all running transitions to allow layout (among other
things) to work correctly, then resume() after this is finished. This works
in general, but pause/resume do not take account of child transitions that
have already played and ended. ChangeBounds, uses pause/resume to
restore normal layout and re-enable layout suppression. This means that
when resume() is called on a ChangeBounds transition that has already
ended, that transition will leave the parent in a suppressed-layout
state, basically forever. This can cause artifacts like we're seeing in
recent ActionBar changes where the account spinner is never repopulated because
layout is never allowed to run.

The fix is to note when a transition ends and noop future calls to pause/resume.

Issue #10648936 Transitions don't work with new ActionBar functionality

Change-Id: Id9d41c0352b2270d46cfd5ad4dba130767bbf303
2013-09-10 11:36:10 -07:00
Alan Viverette
7d8314db41 Make ListView's illegal state exception more helpful
Change-Id: I3d3205d32c6992c184a218248ba72ebf6c45a2d1
2013-09-10 11:22:53 -07:00
Amith Yamasani
622bf2220c Backup and restore ringtone and notification ringtone
Use the new content provider API to canonicalize Uris.
If the provider doesn't support it, don't save the value,
unless it's a silent ringtone.

Bug: 10130785

Change-Id: Id08bb2812b9b2a7036a25801d1997661b0017629
2013-09-10 11:08:24 -07:00
Kenny Root
4a406787c7 Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
2013-09-10 11:05:23 -07:00
Santos Cordon
4f7ffa90d1 Add permissions for the InCallUI Split.
Change-Id: I7e45aeebbe8873f99fe897272390fb06f1840d2d
2013-09-10 10:43:05 -07:00
Vinit Deshapnde
f7bea43325 am ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev
* commit 'ba85b970f3ae7fd58c9a631e64bff0d05b787b9b':
  Set country code on P2p interfaces as well
2013-09-10 10:35:18 -07:00
Vinit Deshapnde
ba85b970f3 Merge "Set country code on P2p interfaces as well" into klp-dev 2013-09-10 17:32:52 +00:00
Yuhao Zheng
41c55361d1 am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
  Add a hidden API to toggle airplane mode.
2013-09-10 10:13:22 -07:00
Yuhao Zheng
e91a3f5229 Merge "Add a hidden API to toggle airplane mode." into klp-dev 2013-09-10 17:12:00 +00:00
Martijn Coenen
6343075fbf am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
* commit '9720d5e11c5175503b383bd903c68d2408d2bb80':
  Remove legacy HCE APIs.
2013-09-10 10:07:38 -07:00
Martijn Coenen
9720d5e11c Merge "Remove legacy HCE APIs." into klp-dev 2013-09-10 17:04:32 +00:00
Yuhao Zheng
5cd1a0e8d7 Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
2013-09-10 09:57:12 -07:00
Glenn Kasten
10779b12ee am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev
* commit 'd9f4e0cf2c2466d9e05f8562e55d342934f7ed0d':
  AudioTrack.getTimestamp() return type is now boolean
2013-09-10 09:39:18 -07:00
Glenn Kasten
d9f4e0cf2c Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 2013-09-10 16:36:23 +00:00
John Reck
8eb3ece8ee am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev
* commit '1d2daa7809b58c226410c0060d7837de0a29888a':
  Remove FD optimization case for decodeStream
2013-09-10 09:29:12 -07:00
John Reck
1d2daa7809 Merge "Remove FD optimization case for decodeStream" into klp-dev 2013-09-10 16:25:14 +00:00
Marco Nelissen
488e925ff9 am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev
* commit '8716c08151378f7488a0f129fe43a0b3d4dc499d':
  Use correct timescale for "date taken" field
2013-09-10 09:12:05 -07:00
Marco Nelissen
8716c08151 Merge "Use correct timescale for "date taken" field" into klp-dev 2013-09-10 16:09:16 +00:00
Amith Yamasani
23d6b7b360 am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
* commit '618f8cc5dbb6dff03ad3270d6b948b1ef90c5dd6':
  Don't leave space for summary text if it's an empty string
2013-09-10 09:01:09 -07:00
Amith Yamasani
618f8cc5db Merge "Don't leave space for summary text if it's an empty string" into klp-dev 2013-09-10 15:59:37 +00:00
Zhijun He
cfd47481d1 MediaMuxer: Add setLocation API
This API could be used for camera recording when MediaMuxer is used to write
output media file.

Bug: 10594784
Change-Id: Ide2d6e1d87b246100a5def49bfb8646dc984a512
2013-09-10 07:52:25 -07:00
Marc Wilson
2921cee304 Update documentation for speech APIs.
Makes it clear that the intent and service APIs are likely to stream
audio over the network and notes that impact this has on bandwidth and
battery life.
Also clarifies that the service API should not be used for continuous
recognition as a result. The intent API only runs when the activity is
in the foreground so I didn't mention continuous recognition for it.

Bug: 10674392
Change-Id: Ib5e0c16b3124f4b7d892ef5bd4167f23662d2ca3
2013-09-10 15:41:47 +01:00
Craig Mautner
5c494547af When waiting for activity to finish don't reset
In cases where the client is waiting for an activity to launch
(startActivityMayWait()) it is a bad idea to clear
ActivityRecord.displayStartTime when going into the pause state. If
displayStartTime is cleared before the activity is displayed,
the client will never be released.

This fix keeps pause from clearing displayStartTime if any client
is waiting for the activity to be displayed.

Fixes bug 10095558. But not a permanent fix, startActivityMayWait()
should not be called by any production code.

Change-Id: I7cbdcb04256f4a26233867c52aedd3bc4151adc3
2013-09-10 07:39:51 -07:00
Stephen Hines
9b44898979 am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev
* commit 'e3d0f022826a2a16e64dc9b5353a2a514393881b':
  Don't set Allocation mSize when we have no Type.
2013-09-09 22:25:22 -07:00
Stephen Hines
e3d0f02282 Merge "Don't set Allocation mSize when we have no Type." into klp-dev 2013-09-10 05:23:15 +00:00
Baligh Uddin
8545440358 am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5f5e84770badd10c41fd4a2b01a9958a607eacd9':
  Import translations. DO NOT MERGE
2013-09-09 22:06:26 -07:00
Baligh Uddin
ad53a540ed am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a244732d93c09da1db9fd79b6e7275649a18c60b':
  Import translations. DO NOT MERGE
2013-09-09 22:02:58 -07:00
Baligh Uddin
5f5e84770b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 05:00:52 +00:00
Baligh Uddin
a244732d93 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 04:58:04 +00:00
Igor Murashkin
a86ab640f7 Surface: Change OutOfResourcesException to be a runtime exception
- Deprecates SurfaceTexture.OutOfResourcesException, it wasn't used
- Make all JNI code throw only Surface.OutOfResourcesException
- Get rid of redundant SurfaceControl.OutOfResourcesException

Bug: 10566539
Change-Id: I58126260771b9ccff6a69c672ce7719b9f98138d
2013-09-09 21:53:59 -07:00
Jeff Sharkey
7b69c566fd am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-dev
* commit '9e2c661b3ba26fa8de1299608e27aa95e124a413':
  Fix getCallingPackage() to handle reentrance.
2013-09-09 21:46:18 -07:00
Jeff Sharkey
78bb372fb7 am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev
* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
2013-09-09 21:42:50 -07:00
Jeff Sharkey
9e2c661b3b Merge "Fix getCallingPackage() to handle reentrance." into klp-dev 2013-09-10 04:41:53 +00:00
Jeff Sharkey
af9272349f Merge changes I7b3f4c68,I9f022a08 into klp-dev
* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
2013-09-10 04:40:41 +00:00
Jeff Brown
404c4855ab am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev
* commit '392c76b1f6bc756359a70263c1708682f884027a':
  Clarify InputDevice#getControllerNumber documentation
2013-09-09 20:37:52 -07:00
Jeff Brown
392c76b1f6 Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev 2013-09-10 03:35:55 +00:00
Sandeep Siddhartha
37b7632add am bc916b22: Fix checkbuild error due to javadoc reference to hidden class
* commit 'bc916b221a344d0d2f8f6353c5162f9a6d61eb8b':
  Fix checkbuild error due to javadoc reference to hidden class
2013-09-09 19:30:09 -07:00
Sandeep Siddhartha
bc916b221a Fix checkbuild error due to javadoc reference to hidden class
Change-Id: I128b8a6dd725468d0c9503b8229f8939fddb51bc
2013-09-10 02:17:20 +00:00
Jeff Sharkey
72e2e3577b Fix getCallingPackage() to handle reentrance.
Keep any previous value in the stack frame and restore when the
current call is finished.

Bug: 10659409
Change-Id: I02b760ae9ca06a4b3602725e02f649f1ada460a0
2013-09-09 18:52:48 -07:00
Xia Wang
9d5182f9db am 11f2b42d: Remove system user id for cm tests
* commit '11f2b42d8c185ac91db07a539605cba7ecd28e6a':
  Remove system user id for cm tests
2013-09-09 18:15:59 -07:00
Xia Wang
11f2b42d8c Remove system user id for cm tests
Change-Id: I51f500c8e7b4e2963093e20c6f20bcfe020995c9
(cherry picked from commit 575495c29007503566e28004bf60018a824b1f1b)
2013-09-10 01:07:33 +00:00
Mindy Pereira
24870ce4f2 Scale feels too quick in relation to movement
Reduce scale factor in relation to amount of y movement

Change-Id: Iaf351edb2eb1a67f542aa9b3aa3587fc231f8c5c
2013-09-09 18:06:19 -07:00
Stephen Hines
88990da58d Don't set Allocation mSize when we have no Type.
Bug: 10667740

A3D creates Allocations before knowing the underlying Type (and thus size).
Moving the mSize calculation to be conditional for concrete Allocations
eliminates the bug. In the future, we could let A3D dynamically update the
Allocation size if it is necessary to improve heap behavior.

Change-Id: I520246806b6ead0387a1a41372dade1a6e7c2271
2013-09-09 17:56:07 -07:00