112786 Commits

Author SHA1 Message Date
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
Jeff Sharkey
b7757a6b32 Rename offer() to add(), remove/hide some APIs.
Change MatrixCursor offer() to add() based on review feedback.  Remove
some now-unused XML metadata.  Hide document creation, since it's not
supported in initial version.

Bug: 10577809, 10461706, 10678563
Change-Id: I7b3f4c6899c28f633471ef816bee22bf032aa0d2
2013-09-09 17:55:10 -07:00
Jeff Sharkey
fb3445c9b3 Sort order is sticky for session, back leaves.
Instead of persisting sort order per-directory, the order is now
sticky for that session.  Any user selected sort order takes
precedence over an ordering hinted by a backend.

When a restored DocumentStack is untouched, the back key now leaves
the dialog, instead of popping from the restored stack.

Persist list/grid mode changes async.

Bug: 10659604, 10672973
Change-Id: I9f022a081c014537447c9c2af10e19d8cd9566aa
2013-09-09 17:35:48 -07:00
Jeff Sharkey
6874b17d79 am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev
* commit 'ff44ed58a1e38ff830e74b0d73549ff01725852d':
  Disabled states, more UX work, bug fixes.
2013-09-09 17:10:24 -07:00
Jeff Sharkey
ff44ed58a1 Merge "Disabled states, more UX work, bug fixes." into klp-dev 2013-09-10 00:08:17 +00:00
Jeff Sharkey
3f4c205fd3 Disabled states, more UX work, bug fixes.
Fix drawable state to correctly show dimmed disabled state.  Update
disabled state for all children to grey out text.

Block multi-selection of documents not matching MIME filter.  Load
thumbnails in parallel.  Show thumbnails in list mode based on MIME
type to match spec.

Give each footer a unique view type to avoid recycler crashes.

Show breadcrumb icons in recent create paths.  Fix timestamp bug when
querying/updating recent paths.

Make ContentProviderClient.closeQuietly() really be quiet.

Bug: 10668364, 10510022, 10668701, 10534224, 10667726
Change-Id: I3c705412fb211519f15ad41a273a7533b878e9e5
2013-09-09 16:55:35 -07:00
Tim Murray
9163b1d9ce am 23ae1461: Merge "Add flags word to initialization." into klp-dev
* commit '23ae1461d2cf0ac3f1da71200544381a8d8a4957':
  Add flags word to initialization.
2013-09-09 16:53:16 -07:00
John Reck
5835157d76 Remove FD optimization case for decodeStream
Bug: 10677727
 The problem is that the FileInputStream may be wrapping a pipe or
 AssetFileDescriptor which fails if handed to decodeFileDescriptor.
 The problem is that AFDs can start in the middle of a file, whereas
 decodeFileDescriptor assumes it can mmap() the FD and start at
 the beginning.

Change-Id: I98a3c5f789865145e25a99b32d205e290808c1cf
2013-09-09 23:41:20 +00:00
Tim Murray
23ae1461d2 Merge "Add flags word to initialization." into klp-dev 2013-09-09 23:34:38 +00:00
Sandeep Siddhartha
e6139bf086 am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev
* commit '85e7177abe3024218de589a94bc0914bcfe51547':
  Move public consts to HotwordRecognitionService
2013-09-09 16:30:10 -07:00
Vinit Deshapnde
2c385ecb1c Set country code on P2p interfaces as well
This change will set country code on P2p interfaces as well, so the
drivers are free to use channels that are permitted regionally. This
is required for FCC style compliance and Miracast certification.

Bug: 10513263

Change-Id: I88c645bd488066d5167e23e2772f2e0e1f40fa8a
2013-09-09 16:28:31 -07:00
Sandeep Siddhartha
85e7177abe Merge "Move public consts to HotwordRecognitionService" into klp-dev 2013-09-09 23:25:27 +00:00
Vinit Deshapnde
10652a95b1 Fix invalid Wifi Network system crash
There is some validation code that is eventually detecting that we
have an invalid network; only the result is a crash. The right thing
to do is to do validation up front; and fail calls if the network
configuration looks invalid.

Bug: 10571289

Change-Id: I100506b777a34b26ac9a310ba508140560f87a90
2013-09-09 16:24:36 -07:00
Tim Murray
9578e64240 Add flags word to initialization.
bug 10427951

Change-Id: I1356b9b96315ead44aa3898de5604d75f9bb8be5
2013-09-09 16:23:27 -07:00
Chet Haase
be4b48240e am bce89a42: Merge "Add updateListener to ViewPropertyAnimator" into klp-dev
* commit 'bce89a426978ab7bd40e5fa9eb2d99e569422a2e':
  Add updateListener to ViewPropertyAnimator
2013-09-09 16:06:23 -07:00
Chet Haase
bce89a4269 Merge "Add updateListener to ViewPropertyAnimator" into klp-dev 2013-09-09 23:03:28 +00:00