drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,017 Commits 1 Branch 0 Tags
Commit Graph

198017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
ce5bcf8b89 am ad5f292b: Merge "Extend the time between WiFi energy samples" into mnc-dev 
* commit 'ad5f292b037a61b9975b1b8d10a1b4202ac533cf':
  Extend the time between WiFi energy samples
 2015-06-23 21:21:54 +00:00
Adam Lesinski
ad5f292b03 Merge "Extend the time between WiFi energy samples" into mnc-dev 2015-06-23 21:12:35 +00:00
oleksii stepanian
3285efc02c am e6953913: Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 
* commit 'e6953913536155a5d1f78d184e67a74f9acbe1c1':
  Send installerUid for verification when using PackageInstaller.
 2015-06-23 21:07:39 +00: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
8f528531e1 am 8d9ad193: Merge "Default permissions for carrier apps." into mnc-dev 
* commit '8d9ad19341e19256651ef86274a4382f2c09b279':
  Default permissions for carrier apps.
 2015-06-23 20:55:59 +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
168af812db am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c':
  Keymaster key validity dates are optional.
 2015-06-23 20:42:49 +00:00
Chris Wren
95470bf097 am f1b25bd4: fix the build: remove duplicated line 
* commit 'f1b25bd43464b2603da98ce5f03f41d9819d2374':
  fix the build: remove duplicated line
 2015-06-23 20:42:45 +00: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
Jae Seo
7a91fd6221 am ac2c8908: Merge "TIF: Add more description to the poster art and thumbnail columns" into mnc-dev 
* commit 'ac2c8908114534b47822a483e540d0071dd24e5f':
  TIF: Add more description to the poster art and thumbnail columns
 2015-06-23 20:04:58 +00:00
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
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