191448 Commits

Author SHA1 Message Date
Jeff Brown
4244ce6a17 Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
2015-05-06 16:02:22 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
2015-05-06 16:02:21 -07:00
Alex Klyubin
4d5443f37f Define String constants for AndroidKeyStore crypto.
This defines the String enum values based on JCA standard names for
key algorithm, block mode, padding schemes, and digests. This should
make it safer to interact with AndroidKeyStore code that uses JCA
strings. This was requested by API Council.

Bug: 18088752
Change-Id: I241d9225a13b85479d0a84e49d0a98cbc77e5817
2015-05-06 15:59:56 -07:00
Seigo Nonaka
ccee75966a Do nothing if hideSoftInput is called from not focused client.
IMMS#hideSoftInput calls IMMS#setImeWindowVisibilityStatusHiddenLocked
if it is called from not focused client.  However this function changes
IMS visibility state and also changes the back key indicator wrongly.
IMMS should just ignore IMMS#hideSoftInput from not-focused client.

As a preparation to fix b/20764441, this CL partially reverts
Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0 but shouldn't have any
user-visible UX regressions.

Bug: 20764441

Change-Id: I60963f1474457ff37cca85e262460dca8105acff
2015-05-06 22:58:28 +00:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
2015-05-06 15:57:09 -07:00
John Spurlock
c2ec334079 Merge "Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:05 +00:00
John Reck
ae2e8b4891 Add warning if an in-use Bitmap is reconfigured
Bug: 18928352

Also fix an issue around re-configure not properly handling
mPinnedCount in android::Bitmap

Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
2015-05-06 15:30:16 -07:00
Yorke Lee
9a7db1a6f5 Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev 2015-05-06 22:29:25 +00:00
John Spurlock
51a871d48a Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
2015-05-06 18:22:40 -04:00
Nicolas Prevot
2665fdfd61 Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev 2015-05-06 22:18:36 +00:00
John Reck
4862e973a6 Merge "Annotate Application with @CallSuper" into mnc-dev 2015-05-06 22:09:59 +00:00
Jinsuk Kim
e184a6b9ac Merge "CEC: Reset active source/path before going into standby" into mnc-dev 2015-05-06 22:07:23 +00:00
Matthew Williams
41fe5292fd Merge "Delay all syncing until the device is provisioned" into mnc-dev 2015-05-06 21:46:22 +00:00
Raph Levien
6402dc7e4a Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev 2015-05-06 21:35:13 +00:00
Raph Levien
3bd60c7b11 Clear all StaticLayout.Builder fields on pool recycle
When returning a StaticLayout.Builder object to the pool, it is
important to clear everything out. If not, then the object may have
stale state from a previous layout operation. This was causing CTS
test failures and probably other mischief.

Bug: 20636917
Change-Id: I76fb20076ee954fcb476131a8fbe8833d72fbc0d
2015-05-06 14:26:35 -07:00
John Spurlock
03dbaf15ee Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev 2015-05-06 21:20:31 +00:00
John Spurlock
0c467064e2 Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev 2015-05-06 21:20:13 +00:00
Tim Murray
54e685c4bc Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev 2015-05-06 21:19:44 +00:00
John Spurlock
9ea3a1e19f Volume a11y: Resize zen footer text when changed.
Bug: 20346315
Change-Id: Ia6af36d856a17639bf27c9a7b4941655d38d2a99
2015-05-06 17:12:18 -04:00
Adam Powell
cfd6e9dfd0 Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev 2015-05-06 21:09:20 +00:00
Ruben Brunk
0a323036e2 Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev 2015-05-06 21:02:36 +00:00
Sanket Padawe
60137fdcb3 Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev 2015-05-06 20:59:16 +00:00
John Spurlock
401943053f Volume a11y: Rename introduction 'confirm' button to 'close'.
For the benefit of screen readers.

Bug: 20813824
Change-Id: I776cf75d3c0f2e2d5b67bcbad476a28f9ef37c5f
2015-05-06 16:53:21 -04:00
Tim Murray
bfbcd88aee Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Change-Id: I069a2836cf1405adfd018ba0a058bf8f4a1cd39c
2015-05-06 13:52:06 -07:00
Seigo Nonaka
06bdf9c6a6 Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev 2015-05-06 20:31:19 +00:00
Seigo Nonaka
80ff4ed6bb Always show auxiliary subtypes from NavBar keyboard icon.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994

Change-Id: I1e50ee42838a1bf64a612da4904aa93458d44ea4
2015-05-06 20:29:05 +00:00
Adam Powell
2ed547e55f Add alternate intents and refinement callbacks to ChooserActivity
Allow a calling app to supply an array of additional Intents to the
system ChooserActivity.

The chooser will present a merged list of targets that can handle any
of the Intents supplied, including both the standard EXTRA_INTENT as
well as any of the intents supplied in EXTRA_ALTERNATE_INTENTS. These are
treated as ordered; EXTRA_INTENT is considered the first/primary
Intent and EXTRA_ALTERNATE_INTENTS are sorted most important first.

Targets are queried for all supplied Intents. If the same component is
returned for more than one Intent, the target is associated with the
most important Intent that matched.

This allows calling apps to supply several different payloads for an
action depending on what the intended targets are able to support. For
example, an app performing ACTION_SEND may supply image/jpeg data to
compatible targets or a hosted web link to targets that only support
text/plain. The user will have the opportunity to pick from a single
merged list of choices using the best available payload, and will not
be bothered with the implementation details of how the payload will be
delivered to the recipient.

If the calling app wishes to provide further disambiguation or
refinement after the user makes a choice, for example to let the user
choose which of the source intents to send from the primary or
alternates, show a progress dialog as a full-resolution version of a
photo is downloaded from the server before being sent along or while
reticulating splines, the caller can supply an IntentSender to
ACTION_CHOOSER including the extra EXTRA_REFINEMENT_INTENT_SENDER.
This should be the IntentSender obtained from a PendingIntent pointing
at an activity to launch to perform the refinement.

The refinement activity should report that it is finished by obtaining
the ResultReceiver from EXTRA_RESULT_RECEIVER. Available intents to
send to the selected target will be contained in EXTRA_INTENT and
EXTRA_ALTERNATE_INTENTS.

To complete the refinement and send the result along to the chosen
target, the refinement activity should select one of the supplied
intents and send it to the ResultReceiver in a Bundle with the key
EXTRA_INTENT and the result code RESULT_OK. To cancel the refinement,
and let the user select another choice, send RESULT_CANCEL.

While refinement activities cannot modify the filterEquals-affecting
fields of the Intent they return, they may modify extras to provide
additional or altered details to the final recipient. These extras
will be filled into the Intent sent to the final target.

Change-Id: I7ad4739eadd1a0e307675847ccf47ea948918a3a
2015-05-06 13:23:36 -07:00
Christopher Tate
a1d3c508e1 Merge "Fix requestRestore() of an app's own package" into mnc-dev 2015-05-06 19:41:40 +00:00
Jason Sams
22f07f89df Merge "Fix Allocation-less launches" into mnc-dev 2015-05-06 19:40:21 +00:00
Tim Murray
a0511081d0 Merge "Add loop option to hwuitest." into mnc-dev 2015-05-06 19:31:48 +00:00
Christopher Tate
5aba226d8a Fix requestRestore() of an app's own package
The BACKUP permission check was being applied over-zealously.

Bug 19336200

Change-Id: Ia52b5c5cc0fd8d19b74ee624be85113d1b8dca7e
2015-05-06 12:31:46 -07:00
Tim Murray
1a0f1c7c16 Add loop option to hwuitest.
Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8
2015-05-06 12:22:35 -07:00
George Mount
9189445c0a Add CallbackRegistry.
Change-Id: Ib1a30a0ec8b1ece25046d85676432fb0b819f952
2015-05-06 12:18:52 -07:00
Alex Klyubin
658cd6601d Use ProviderException in AndroidKeyStore.
This switches to ProviderException in most places in AndroidKeyStore
primitives where checked exceptions cannot be thrown. This is to
follow JCA design.

KeyStoreKeyGeneratorSpi is not touched by this CL because there's
another CL already doing that.

Bug: 18088752
Change-Id: If7e93042f973334b9bba004f5a330f831c1e77c1
2015-05-06 11:37:38 -07:00
Chris Wren
9260cb7ffe Merge "count panel open method" into mnc-dev 2015-05-06 18:34:47 +00:00
Matthew Williams
8b76d20c71 Delay all syncing until the device is provisioned
BUG: 20185340
Add ContentObserver to be notified when device provisioned
system setting bit is flipped. Stash all messages that come
along before then, similar to how we were doing it for
onBootCompleted, and fire them off when ready.

Change-Id: Ied9fe2262b2a96ea3316b6dd7c57e23628e19581
2015-05-06 11:24:35 -07:00
Alex Klyubin
83a86c5ce4 Always mix in additional entropy into keymaster.
This makes AndroidKeyStore Cipher and KeyGenerator implementations mix
in additional entropy into keymaster's RNG regardless of whether they
were provided with a SecureRandom instance.

In practice, they are always provided with a SecureRandom instance.
However, to be safe, when no SecureRandom instance is provided the
code now uses a platform-default SecureRandom implementation.

Bug: 18088752
Change-Id: I85bca30d7bdc82c2a342094dcbe6044e48a63dca
2015-05-06 11:11:45 -07:00
Eric Laurent
b65cd17b05 Merge "Implement audio routing callbacks" into mnc-dev 2015-05-06 17:51:53 +00:00
Alex Klyubin
6223ec129b Merge "Keystore uses 0 for invalid operation handles." into mnc-dev 2015-05-06 17:26:11 +00:00
Alan Viverette
809d5d7fbe Merge "DayNight theme for framework packages" into mnc-dev 2015-05-06 17:25:26 +00:00
Alan Viverette
4d5c20c613 Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev 2015-05-06 17:24:31 +00:00
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00:00
Alex Klyubin
9cfc428a24 Keystore uses 0 for invalid operation handles.
This propagates the concept that 0 is an invalid crypto operation
handle to the outside of AndroidKeyStore abstraction.

Bug: 20864436
Change-Id: I1e5abb66c5d41d8fc32aac44372495a708c2b6e2
2015-05-06 10:16:57 -07:00
Alan Viverette
71b0cb043f Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev 2015-05-06 17:11:24 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
2015-05-06 10:09:35 -07:00
Eric Laurent
4bcdba8484 Implement audio routing callbacks
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
2015-05-06 17:03:50 +00:00
Alan Viverette
c97b922aba Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev 2015-05-06 16:58:09 +00:00
Chris Wren
49f06f5f0d count panel open method
open panel
  open with two fingers
  open via peek
  pull down to open QS
  tap to open QS

Bug: 20262922
Change-Id: I7eaa8a6de75867035c64a3ac939cec86daaab913
2015-05-06 12:57:55 -04:00
Alexander Martinz
27cf86939d Fix setting hotspot bounds in a drawable container
We are passing the wrong parameters for setting hotspot bounds.
Bottom and right are in the wrong order, correct it.

Change-Id: I2762fc3a4c29f05ba8b7e71a5c6cad0be16c2ae0
2015-05-06 09:55:49 -07:00
John Reck
add70268b1 Annotate Application with @CallSuper
Bug: 19844784
Change-Id: I12431ed65edd0076e1231ba6ebcff479580370c4
2015-05-06 09:44:53 -07:00