195918 Commits

Author SHA1 Message Date
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Sharvil Nanavati
8a0fd13081 Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev 2015-06-23 23:24:10 +00:00
Alan Viverette
ac6cfb32fe Throw IAE on invalid measure spec size
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
2015-06-23 16:23:49 -07:00
Sharvil Nanavati
e7908c7ff2 resolved conflicts for merge of 64a4858b to mnc-dev
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
2015-06-23 16:23:06 -07:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens.
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
2015-06-23 16:23:03 -07:00
Doris Liu
0ab731340b Merge "Add enter/exit animation for window provided CAB" into mnc-dev 2015-06-23 23:20:02 +00:00
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
2015-06-23 16:11:07 -07:00
Bryce Lee
91d2cbf447 am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
  Turn off theater mode upon power button press.
2015-06-23 23:04:26 +00:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions.
This reverts commit ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
Ricardo Garcia
3a30a76e88 Fix for SafeMedia logic and CTS tests
Added audio.safemedia.bypass system property to bypass SafeMedia logic on
CTS tests which require guaranteed access to full range of volume levels.

bug: 21779099
Change-Id: I76815a995f08d426218206af7aade491c5debd9e
2015-06-23 15:54:45 -07:00
Chris Craik
5ec6a2878b Unify clipping return value behavior - true if not empty
bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
2015-06-23 15:42:43 -07:00
Zach Johnson
12402dafea Merge "Update CarrierService long lived binding API" into mnc-dev 2015-06-23 22:19:25 +00:00
Santos Cordon
f2600eb5ac InCallService meta-data [2/4]
Bug: 21816241

Change-Id: I9af91a1287f652247ef590878759aa277bd925e5
2015-06-23 15:13:39 -07:00
Alan Viverette
9137fcaa92 Merge "Remove isDither(), deprecate setDither()" into mnc-dev 2015-06-23 22:06:15 +00:00
Todd Kennedy
c60408264c Merge "Skip upgrade keys for adopted storage" into mnc-dev 2015-06-23 21:42:06 +00:00
Todd Kennedy
c003989488 Merge "Handle volume benchmark timeout" into mnc-dev 2015-06-23 21:41:20 +00:00
Todd Kennedy
8101ee6884 Handle volume benchmark timeout
If a volume benchmark operation times out, we don't want to show
a cryptic toast message. Instead, we return a very large integer
[eg Long.MAX_INT]. The storage wizard can then use this value
to show an appropriate dialog if it chooses.

Bug: 21376364
Change-Id: I3d97336e19c93511cfff2cbdb2f07ab033a1143d
2015-06-23 14:40:32 -07:00
Adam Lesinski
8144aa2e9a Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 2015-06-23 21:37:20 +00:00
Zach Johnson
08a244cee8 Update CarrierService long lived binding API
Should take a metadata approach instead of a separate
intent.

b/21080696

Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
2015-06-23 14:31:13 -07:00
Alan Viverette
81e7dbddf1 Remove isDither(), deprecate setDither()
Bug: 22013358
Change-Id: I37b11a94edc431a88522c6c056b76b045daa61d6
2015-06-23 14:30:40 -07:00
Jae Seo
1d462aa6f8 Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 2015-06-23 21:28:00 +00:00
Nancy Chen
a51765ed6d Add public action to open voicemail settings.
Need public api constant to create an intent to open voicemail settings.
This is used for visual voicemail.

Bug: 21086059
Change-Id: I1a11712ead2941d5322cde6be6c3f41652bc36d8
2015-06-23 14:17:48 -07:00
Adam Lesinski
f374a4bc2a Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS
Bug:22008542
Change-Id: Ifb4565ec8077e88596f0304328c083c7d1c9db04
2015-06-23 14:15:04 -07:00
Adam Lesinski
ad5f292b03 Merge "Extend the time between WiFi energy samples" into mnc-dev 2015-06-23 21:12:35 +00:00
Sharvil Nanavati
64a4858b32 resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
2015-06-23 14:07:26 -07:00
oleksii stepanian
e695391353 Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 2015-06-23 20:58:34 +00:00
Jeff Davidson
8d9ad19341 Merge "Default permissions for carrier apps." into mnc-dev 2015-06-23 20:43:06 +00:00
Adam Lesinski
06f46cb320 Extend the time between WiFi energy samples
With bursty WiFi traffic, we end up sampling the WiFi controller's
energy data quite a lot. Extend the timeout so that we sample
once there has been no activity for 15 seconds.

Note: Once the WiFi radio goes down after being active, it can come back and be
active in less than 15 seconds, which means we may sample twice quickly.

Bug:21478443
Change-Id: I99081b664f8a33fef734bc55eef4d33ac297e83a
2015-06-23 13:42:53 -07:00
Alex Klyubin
90c9e4eb54 Merge "Keymaster key validity dates are optional." into mnc-dev 2015-06-23 20:35:30 +00:00
Chris Wren
f1b25bd434 fix the build: remove duplicated line
Change-Id: I0ae6443dd7237b8cce14d12967edd0afb8d34196
2015-06-23 16:28:33 -04:00
Dianne Hackborn
8ecf16d186 Fix issue #20654534: API Review: android.app.assist
Remove the old ViewAssistStructure class.

Change-Id: I5eca7bc7af93cda5f654c9094a3aa07fe4958da2
2015-06-23 13:09:21 -07:00
Jae Seo
ac2c890811 Merge "TIF: Add more description to the poster art and thumbnail columns" into mnc-dev 2015-06-23 20:01:37 +00:00
Chris Wren
72e7230b90 Merge "collect more stats about the notification API" into mnc-dev 2015-06-23 19:56:21 +00:00
Jason Monk
81b4636093 Merge "Add metrics to brightness slider" into mnc-dev 2015-06-23 19:56:13 +00:00
Jorim Jaggi
a0d58ae574 Use ashmem backed bitmaps for passing around notifications
Avoids many copies during IPC and duplicate Java heap consumption in
system_server, SystemUI, etc.

Bug: 18386420
Change-Id: Id5ac9406062d472f7848009d65f12131f5f4dac9
2015-06-23 19:55:41 +00:00
Jason Monk
97b87a9929 Add metrics to brightness slider
Had to add a way for BrightnessController to know when its the end
of a touch, so that we don't spam the event logs with intermediate
values.

Added visibility to BrightnessDialog as this is what settings
launches.

Bug: 21528168
Change-Id: Ie214b4ddb0c9f9bbe8c4f182f9c59f229963ebc7
2015-06-23 15:54:13 -04:00
Ruben Brunk
323b768d6d Merge "Ensure camera service is notified of user profile changes." into mnc-dev 2015-06-23 19:48:23 +00:00
Ruben Brunk
a59a8707ea Ensure camera service is notified of user profile changes.
Bug: 21996939
Change-Id: Ie2578c4de587d26090f46b15e958ab9820f0ccf7
2015-06-23 12:47:08 -07:00
Amith Yamasani
862ab87bda Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 2015-06-23 19:43:41 +00:00
Paul Jensen
9065b81016 Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 2015-06-23 19:40:38 +00:00
Paul Jensen
28dd8c4a29 Merge "Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes" into mnc-dev 2015-06-23 19:40:21 +00:00
Paul Jensen
dafd561298 Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 2015-06-23 19:40:02 +00:00
Dianne Hackborn
a6fb1e70ff Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 19:33:04 +00:00
Maxim Bogatov
e5a4a91c01 Merge "Transfer a11y node with a11y event" into mnc-dev 2015-06-23 19:26:58 +00:00
Svetoslav
3ee0c63569 Merge "System settings can be changed by system apps." into mnc-dev 2015-06-23 19:11:27 +00:00
Svetoslav
f41334bb15 System settings can be changed by system apps.
The system settings permission is going away and the user will
be able to choose which apps have access to system settings in
the UI. So, if an app is white-listed by the user or being on
the system image, we allow access to system settings. Also if
the caller has the stronger write secure settings permission
we allow changes of the less sensitive system settings.

Change-Id: I7aca958fd0ad2c588117b8c6e44d78eb16d648bc
2015-06-23 12:10:30 -07:00
Alex Klyubin
d6c7799b9a Keymaster key validity dates are optional.
This CL makes Android Keystore framework code add
KM_TAG_ACTIVE_DATETIME, KM_TAG_ORIGINATION_EXPIRE_DATETIME, and
KM_TAG_USAGE_EXPIRE_DATETIME tags to the authorizations set only
if the corresponding time instants were specified through the
framework-level API. This is fine because these tags are optional as
it turns out.

Bug: 18088752
Change-Id: I6a5ae4cadb441e61576231815e6bec6e9248bc72
2015-06-23 12:06:27 -07:00
Amith Yamasani
0bf8f7cc39 Runtime permissions cannot be set on legacy apps by device policy
Clarify docs that runtime permissions can be granted or revoked by
a profile owner/device owner only for MNC apps and not legacy apps.

Check the targetSdkVersion and return false if legacy app.

Remove all policy flags from permissions when cleaning up
a device or profile owner.

Bug: 21835304
Bug: 21889278
Change-Id: I4271394737990983449048d112a1830f9d0f2d78
2015-06-23 12:01:36 -07:00