194710 Commits

Author SHA1 Message Date
Wale Ogunwale
a512c2140d Fixed issue with using wrong display id when creating context for displays
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
2015-06-09 17:28:12 -07:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Stefan Kuhne
011c133e3c Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 2015-06-10 00:21:49 +00:00
Fyodor Kupolov
c2ae0090d2 Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 2015-06-10 00:16:14 +00:00
Dan Stoza
cf70d71781 screencap: Rotate images when display is rotated
Changes screencap to read the display rotation and use it when
capturing the screenshot so that the output image is oriented
correctly.

Bug: 8433742
Change-Id: I0f7db422399985a1ff17da3faa946ff0943e58f7
2015-06-09 16:53:11 -07:00
Fyodor Kupolov
b615799504 Do not create profile if FEATURE_MANAGED_USERS is not available
Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
2015-06-09 16:51:13 -07:00
Adrian Roos
9b9947de5d ImageWallpaper: Atomically fetch display info
Previously we fetched rotation and dimens separately
which had the potential to cause inconsistencies.

Bug: 21440533
Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
2015-06-09 16:48:57 -07:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Erik Kline
64d6ce8a66 Merge "initial revision of NetworkDiagnostics" into mnc-dev 2015-06-09 23:23:03 +00:00
Robin Lee
63cc6458ac Merge "Switch over to updated VPN warning strings" into mnc-dev 2015-06-09 23:13:38 +00:00
Filip Gruszczynski
2bad67b16f am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity."
* commit '6974f22d1148f0140b4abc76cc58e6bd6ad7842a':
  Revert "Recompute focus stack if cleared while starting an activity."
2015-06-09 23:10:32 +00:00
Wale Ogunwale
d648975f51 am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity.
* commit '64b586e19f3cd4069d57424ddc21c5213c94a767':
  Recompute focus stack if cleared while starting an activity.
2015-06-09 23:10:27 +00:00
Luan Nguyen
e44643b15c am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs
* commit '33677f0c1050ae73447136ec3e88d1140a53da4b':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
2015-06-09 23:10:21 +00:00
Wale Ogunwale
2c4643dd80 Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 2015-06-09 23:01:05 +00:00
Yao Chen
597ad3fb51 Copy lockTaskLaunchMode from target activity to its alias.
Bug: 21675800
Change-Id: I518f71d57b0a113797fb3879b776cc7142351218
2015-06-09 16:00:14 -07:00
Selim Cinek
f87baef1b1 Fixed a crash with HUN's
The sorted order was never correctly updated, leading to
dead elements inside the map which might even be a memory
leak in the worst case.

Bug: 21725521
Change-Id: Ic2064a04d458445d11df94e0358d4d2044c8b995
2015-06-09 15:56:24 -07:00
Wale Ogunwale
cac3dc636d Fixed issue with using wrong display id when creating context for displays
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
2015-06-09 15:35:02 -07:00
John Reck
475c545fa8 Merge "Upload bitmaps in SkShader* safely" into mnc-dev 2015-06-09 22:32:33 +00:00
John Reck
37b0824a46 Upload bitmaps in SkShader* safely
Bug: 19412589
Change-Id: Id50c08ff523d5540f60c39b435c0ab1b4c685655
2015-06-09 15:27:52 -07:00
Jim Miller
31ed2044e2 Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 2015-06-09 22:27:40 +00:00
Jim Miller
e4c58e4641 Add documentation for possible AndroidKeyStore exceptions to authenticate() call
Fixes bug 20864436

Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
2015-06-09 15:26:43 -07:00
Jorim Jaggi
5673353559 Animations/success state for external confirm device credentials (1/2)
Bug: 20929186
Change-Id: I8ca396e353189da7da3e9c98f841b76c876e461e
2015-06-09 15:25:40 -07:00
Chris Craik
751afe2040 Merge "Dont ignore layer paint alpha in software path" into mnc-dev 2015-06-09 22:23:36 +00:00
James Cook
ad35855037 Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
They both need to be 56dp for the buttons to line up properly.

This ports If24608d9f8dbf912025967bf3adef13df105ddaa from
frameworks/support in lmp-mr1-ub-dev

Bug: 19317317
Change-Id: Ie1f77b8cfada45bb9f8b2d14e68c364ae4ebf579
2015-06-09 15:16:44 -07:00
Phil Burk
bcdf0dc199 Merge "MIDI docs: use getPorts()" into mnc-dev 2015-06-09 22:16:44 +00:00
Jun Mukai
0eaec1f5d1 Specifies the new height/width for update() on ListPopupWindow.show().
The current code is doing setHeight()/setWidth() and then invokes
update() with -1 for height/width params. However, javadoc for
setHeight() says that "If the popup is showing, calling this method
will take effect the next time the popup is shown", and update()
says "Width and height can be set to -1 to update location only."

That said, ListPopupWindow should invoke update() with the obtained
width/height instead of invoking setWidth()/setHeight() to resize
the popup window correctly.

Bug: 21276583
Change-Id: I0961820ff2e845a0f68c20d6eea827aa898c2101
2015-06-09 15:11:45 -07:00
Stefan Kuhne
7dcf08c6b2 Dont create a dummy animation for a transferred animation
When multiple windows get created at once, multiple starting windows
will be created as well. The first window will get an animation and a
dummy animation. If another window will get shown shortly after, it
will receive the animation of the first starting window. However, no
new dummy animation should be created for it since otherwise it might
never get an animation end notification.

This CL also reverts previously added changes to ignore dummy animations.

reverted change: Ie907d31f51e130e245a70249a983d490f3d42b21

Bug: 21643278
Bug: 21403998
Change-Id: I228d77a2d9c3597df0eb9c340a65c0c592c35ce6
2015-06-09 12:10:58 -10:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00
Xiyuan Xia
12149b699e Merge "Add setting for assistant" into mnc-dev 2015-06-09 22:00:32 +00:00
Casper Bonde
3b3d1fea94 SAP: Make it possible to enforce a 16-digit pin code (4/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I3205013f9e758c353381442a86845dab467780f8
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-09 21:42:22 +00:00
Jeff Davidson
0cf20cdf81 Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
2015-06-09 14:40:21 -07:00
Tyler Gunn
bc6f12ee42 Remove use of STATE_AUDIO_ONLY in a comparison.
- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
2015-06-09 14:34:11 -07:00
Winson Chung
8f2d084dfe Skip recents preloading when there is no task to animate to.
Bug: 21696081
2015-06-09 14:31:31 -07:00
Xiyuan Xia
e6de8b9ad4 Add setting for assistant
- Add assistant setting in Settings.Secure;
- If the assistant setting is missing, start assistant as current behavior;
- If the setting is present, start assistant use the setting value;

Bug:20210110
Change-Id: I946fbb504452e445879ad688130a1570b857b9c5
2015-06-09 14:21:38 -07:00
Winson Chung
6f024937c1 Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 2015-06-09 21:18:18 +00:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
2015-06-09 14:15:49 -07:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Winson Chung
a278cae54c Skip recents preloading when there is no task to animate to.
Bug: 21696081
2015-06-09 13:51:13 -07:00
Chris Craik
f396f011ee Dont ignore layer paint alpha in software path
bug:19412691

Change-Id: Ie56b2cbc667a078eb4a7c5bfe7b8e8dd6b0fc24b
2015-06-09 13:50:01 -07:00
Yohei Yukawa
62974816a3 Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 2015-06-09 20:30:56 +00:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService
Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
2015-06-09 16:28:54 -04:00
Fyodor Kupolov
7e8e29ad2e Merge "Fixed compile error caused by final keyword" into mnc-dev 2015-06-09 20:19:16 +00:00
Alex Klyubin
6a0b8f4d56 Merge "Switch Android Keystore key gen and import to new KeyStore API." into mnc-dev 2015-06-09 20:17:44 +00:00
Alex Klyubin
8ef015be24 Merge "Support for Android Keystore Cipher.wrap and unwrap." into mnc-dev 2015-06-09 20:17:26 +00:00
Fyodor Kupolov
ac038a9ef3 Fixed compile error caused by final keyword
Bug: 21588537
Change-Id: Ia5ec8a196c2996a494fa2f07aadff0486ea96a57
2015-06-09 13:14:54 -07:00
Yorke Lee
03123839e4 Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 2015-06-09 20:09:57 +00:00
Alex Klyubin
3ceb1a04b4 Switch Android Keystore key gen and import to new KeyStore API.
This makes Android Keystore's asymmetric key generation and import
use the new KeyStore API (similar to keymaster 1.0 API).

Because the resulting private keys will be used through
Conscrypt/keystore-engine which uses the old Keystore API, this CL
implements a temporary workaround where all generated and imported
keys are authorized for padding NONE and digest NONE, in addition to
padding schemes and digests requested by the user of the Android
Keystore API. This workaround is needed because keystore-engine uses
digest NONE and padding NONE for all its crypto operations.

Bug: 18088752
Bug: 20912868
Change-Id: Idc709039d091294265bd000160b5507f13825849
2015-06-09 13:08:02 -07:00
Jason Monk
eac2751908 Merge "Add hotspot accessibility description" into mnc-dev 2015-06-09 20:02:26 +00:00
Jason Monk
08187a4b26 Add hotspot accessibility description
Bug: 20811452
Change-Id: I8de71b1734d37f6154bc59e59ce17adc0cd6f5f3
2015-06-09 15:59:25 -04:00