198058 Commits

Author SHA1 Message Date
Chris Wren
a049cf92ec am 72e7230b: Merge "collect more stats about the notification API" into mnc-dev
* commit '72e7230b90685476a27cb579e4c99f2709105b2c':
  collect more stats about the notification API
2015-06-23 20:04:54 +00:00
Jason Monk
78b964c26c am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev
* commit '81b46360939b70550438da5ed9641d9db559be29':
  Add metrics to brightness slider
2015-06-23 20:04:50 +00: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
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
282d78a9ac am 323b768d: Merge "Ensure camera service is notified of user profile changes." into mnc-dev
* commit '323b768d6d06c73209363f559cdd278e06ca7e48':
  Ensure camera service is notified of user profile changes.
2015-06-23 19:52:09 +00:00
Amith Yamasani
af259ee4e4 am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev
* commit '862ab87bdaede732a0019dfb5c4c9b6567dcc8cb':
  Runtime permissions cannot be set on legacy apps by device policy
2015-06-23 19:52:04 +00:00
Paul Jensen
daf6b73b99 am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev
* commit '9065b810160e34ab4cf4613a5a3d7db69b94d453':
  Disallow requesting networks with mutable NetworkCapabilities.
2015-06-23 19:52:00 +00:00
Paul Jensen
afb94be625 am 28dd8c4a: Merge "Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes" into mnc-dev
* commit '28dd8c4a29fddce5bd462834fbe641b40c906909':
  Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes
2015-06-23 19:51:56 +00:00
Paul Jensen
6716e3dbb1 am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev
* commit 'dafd561298c4162dd6d95a22334e4cd3988a8f84':
  Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
2015-06-23 19:51:52 +00: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
4401943e77 am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev
* commit 'a6fb1e70ffa4faeba725b06610f4daa1ee60ead8':
  Fix issue #20654534: API Review: android.app.assist
2015-06-23 19:38:15 +00:00
Maxim Bogatov
9d919a23e6 am e5a4a91c: Merge "Transfer a11y node with a11y event" into mnc-dev
* commit 'e5a4a91c0129222ac9900a76906f951df5b0ffae':
  Transfer a11y node with a11y event
2015-06-23 19:38:11 +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
1e989663bc am 3ee0c635: Merge "System settings can be changed by system apps." into mnc-dev
* commit '3ee0c635698d36f660ebb6dd139192f36a22c0dc':
  System settings can be changed by system apps.
2015-06-23 19:26:22 +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
7f36f2eecd am 81d299e4: Merge "Don\'t fail if self-signed certificate can\'t be signed." into mnc-dev
* commit '81d299e4b8bb7520881f39303f25b5d68417b9e2':
  Don't fail if self-signed certificate can't be signed.
2015-06-23 19:06:33 +00:00
Chris Wren
268292f6f0 am bb0e985b: Merge "turn off the ligths whenever we see the panel" into mnc-dev
* commit 'bb0e985bed952734f4271672fd804539a66a2d36':
  turn off the ligths whenever we see the panel
2015-06-23 19:06:29 +00: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
Zhijun He
3ca7640abf am aeec90a0: Merge "Camera2: update high speed recording API java doc" into mnc-dev
* commit 'aeec90a050a6d1a07ded9fe3f46aea3a8eba9bf1':
  Camera2: update high speed recording API java doc
2015-06-23 19:06:24 +00: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
Alex Klyubin
81d299e4b8 Merge "Don't fail if self-signed certificate can't be signed." into mnc-dev 2015-06-23 18:58:25 +00:00
Chris Wren
bb0e985bed Merge "turn off the ligths whenever we see the panel" into mnc-dev 2015-06-23 18:54:16 +00:00
Zhijun He
aeec90a050 Merge "Camera2: update high speed recording API java doc" into mnc-dev 2015-06-23 18:52:17 +00:00
Todd Kennedy
c293d3ad1a Skip upgrade keys for adopted storage
Define a new scan flag to control whether or not we're performing
an initial scan for packages. On internal storage, an intial
scan occurs during every boot. For adopted storage, an intial scan
occurs immediately after the adopted volume is mounted or whenever
an application is moved.

Bug: 21815906
Change-Id: Ieda9668230597346bce9ee25ecfa204f931bcef6
2015-06-23 11:47:19 -07:00
Chris Wren
93abac48bb collect more stats about the notification API
3.5 times as many bytes, at 1/4th the frequency, so a net reduction
in log size, although it'll seem like an increase due to being bursty
and therefore more noticable.

Bug: 21530763
Change-Id: Icb1a1a1b0dcd4fd8b3c24f317d39b38f1591757e
2015-06-23 18:38:37 +00:00
Jae Seo
3612821003 TIF: Add more description to the poster art and thumbnail columns
Bug: 21971851
Change-Id: Ibffc42060281d1a9fe1bd83b24f33c6ac19d0afa
2015-06-23 11:27:09 -07:00
Xiaohui Chen
b5148fd609 am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev
* commit 'a2c159fede892a54b9b98e681c6a3053ab4dbf31':
  system_server: optimize app idle parole state change
2015-06-23 18:26:50 +00:00
Hiroshi Yamauchi
189ebe5d1a am a1ee09c8: Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev
* commit 'a1ee09c8438f45a5933803aacab99c300b343420':
  Clarify art.gc.gc-count-rate-histogram runtime stat.
2015-06-23 18:26:46 +00:00
Xiaohui Chen
a2c159fede Merge "system_server: optimize app idle parole state change" into mnc-dev 2015-06-23 18:23:36 +00:00
Hiroshi Yamauchi
a1ee09c843 Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 2015-06-23 18:14:50 +00:00
Paul Jensen
bb2e0e9816 Disallow requesting networks with mutable NetworkCapabilities.
It's not clear what it means to request a network with a mutable
NetworkCapability like NET_CAPABILITY_VALIDATED or
NET_CAPABILITY_CAPTIVE_PORTAL.  Presently requesting such a network
would fail in a number of different ways:
1. The NetworkFactories would fail to match the request against their
   filter which doesn't include stateful NetworkCapabilities.
2. If the NetworkFactories did match, they'd bring up networks to try
   and satisfy the requests, but the networks would not have any
   mutable NetworkCapabilities initially so they'd be reaped.
Because of these problems it's safest to simply disallow these
requests.

Bug: 21343774
Change-Id: I56303242b81d39b370b8d5d1e32059bfcfc25949
2015-06-23 14:13:10 -04:00
Paul Jensen
1c7ba0285b Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes
Without this fix if a listening NetworkRequest with NET_CAPABILITY_VALIDATED
is submitted after a network has been validated but failed the most recent
validation attempt, the NetworkRequest will never receive callbacks.

Bug: 21343774
Change-Id: I6fa6d563c9a6f278b20e645776b707559033b249
2015-06-23 14:11:44 -04:00
Paul Jensen
3d194eae6f Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
2015-06-23 14:09:01 -04:00
Chris Craik
3ac8261f58 am 0d99d43e: Merge "Dump GL errors and crash on failure to allocate texture for layer" into mnc-dev
* commit '0d99d43e819c90f009077b234572e353f2e453fa':
  Dump GL errors and crash on failure to allocate texture for layer
2015-06-23 18:07:03 +00:00
George Mount
1d87cdecc3 am ff0924c7: Merge "Suppress Layout during Visibility transitions" into mnc-dev
* commit 'ff0924c72dabc7072cd85a76a5b26f097107146c':
  Suppress Layout during Visibility transitions
2015-06-23 18:06:59 +00:00
Keisuke Kuroyanagi
30e7f79bd0 am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev
* commit '1384d1d90030d568e1f1b8e7e95ae424ba40bcb5':
  Fix: TextView makes new layouts too frequently.
2015-06-23 18:06:53 +00:00
Zhijun He
3c1ff68d69 Camera2: update high speed recording API java doc
Bug: 21442271
Change-Id: Iff5889394f7723eb0fd7319b9513cd0dca04b927
2015-06-23 11:06:01 -07:00
Chris Craik
0d99d43e81 Merge "Dump GL errors and crash on failure to allocate texture for layer" into mnc-dev 2015-06-23 18:01:02 +00:00
George Mount
ff0924c72d Merge "Suppress Layout during Visibility transitions" into mnc-dev 2015-06-23 17:56:48 +00:00
Keisuke Kuroyanagi
1384d1d900 Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 2015-06-23 17:56:48 +00:00
Alex Klyubin
856aebe571 Don't fail if self-signed certificate can't be signed.
This makes Android Keystore's KeyPairGenerator fall back to generating
a self-signed certificate with an invalid/fake signature when the
attempt to generate a self-signed certificate with a valid signature
fails.

There is a growing number of reasons/authorizations due to which the
generated private key cannot be used to sign the self-signed
certificate. It's safer for KeyPairGenerator to succeed than to fail.

Bug: 22033161
Change-Id: I1ecbd421346166bfd536b5cfbaea169b11f0b1c8
2015-06-23 10:54:44 -07:00