Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,479 Commits 3 Branches 0 Tags
22d5ae5bab2585cf2c8f78bc516ac950ecebaf48
Commit Graph

53769 Commits

Author SHA1 Message Date
Alex Klyubin
22d5ae5bab am 168af812: am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '168af812db385e104532ff8a6437abe94cf9f412':
  Keymaster key validity dates are optional.
 2015-06-23 21:07:44 +00:00
Jason Monk
fd183561e0 am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit '78b964c26ca3e5b1601773a762c8c6989069a8cf':
  Add metrics to brightness slider
 2015-06-23 21:07:14 +00:00
Amith Yamasani
ab8d7e31fb am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'af259ee4e4db82f5f5b0d0d4ad03c5f3270d3e45':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:06:59 +00:00
Paul Jensen
0a99ca6e3c am daf6b73b: am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 
* commit 'daf6b73b9967161a5797348a6703e4e59e97390c':
  Disallow requesting networks with mutable NetworkCapabilities.
 2015-06-23 21:06:54 +00:00
Paul Jensen
d61c4289c9 am 6716e3db: am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 
* commit '6716e3dbb1f667da062054407ad16ae59c78810d':
  Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
 2015-06-23 21:06:44 +00:00
Dianne Hackborn
3eb5480b34 am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '4401943e7723e1ba09469df72db1f4e5b0306016':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:06:39 +00:00
Maxim Bogatov
d6bdd65aa4 am 9d919a23: am e5a4a91c: Merge "Transfer a11y node with a11y event" into mnc-dev 
* commit '9d919a23e6e6da7c3fd2cd10bfe991ddd6dbff64':
  Transfer a11y node with a11y event
 2015-06-23 21:06:35 +00:00
Zhijun He
220a3f8ab4 am 3ca7640a: am aeec90a0: Merge "Camera2: update high speed recording API java doc" into mnc-dev 
* commit '3ca7640abf75e62908e75087a7f98d914352def9':
  Camera2: update high speed recording API java doc
 2015-06-23 21:06:03 +00:00
Xiaohui Chen
5693debd7a am b5148fd6: am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev 
* commit 'b5148fd6099ae0d6a1979dc98a3ff6ac96558b1e':
  system_server: optimize app idle parole state change
 2015-06-23 21:05:44 +00:00
Hiroshi Yamauchi
26898e575c am 189ebe5d: am a1ee09c8: Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 
* commit '189ebe5d1a6529b93665a7a153c58188f71b62b9':
  Clarify art.gc.gc-count-rate-histogram runtime stat.
 2015-06-23 21:05:39 +00:00
George Mount
1d9783637c am 1d87cdec: am ff0924c7: Merge "Suppress Layout during Visibility transitions" into mnc-dev 
* commit '1d87cdecc370c60a27fe85907d528e62cfe34429':
  Suppress Layout during Visibility transitions
 2015-06-23 20:46:28 +00:00
Keisuke Kuroyanagi
da0b7033e6 am 30e7f79b: am 1384d1d9: Merge "Fix: TextView makes new layouts too frequently." into mnc-dev 
* commit '30e7f79bd0a5ab7cdf6c543668dfbda89c2b054e':
  Fix: TextView makes new layouts too frequently.
 2015-06-23 20:46:24 +00:00
Alex Klyubin
90c9e4eb54 Merge "Keymaster key validity dates are optional." into mnc-dev 2015-06-23 20:35:30 +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
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
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
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
Zhijun He
aeec90a050 Merge "Camera2: update high speed recording API java doc" into mnc-dev 2015-06-23 18:52:17 +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
3d194eae6f Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL 
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
 2015-06-23 14:09:01 -04:00
Yin-Chia Yeh
361ef3d239 am e966f01d: am d772b5e3: Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 
* commit 'e966f01d0d6b22fbf0e492cfa5df119394c9e50c':
  Camera: document expected thumbnail size in capture result
 2015-06-23 18:08:15 +00:00
Wale Ogunwale
59ab4b336e am 90cee497: am dd7705bb: Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 
* commit '90cee497c0803861b8a779ca5cd87f4f8c4fde72':
  Update surfaces secure flag on screen capture setting change
 2015-06-23 18:07:54 +00:00
Dianne Hackborn
9a5ea4e9ca am 67e2aab1: am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 
* commit '67e2aab109366fbb146d499f26c1d76c5c45bc52':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
 2015-06-23 18:07:49 +00:00
Dianne Hackborn
80e364a71a am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 
* commit '11ef84c8db8c31afd91b90ac4091e64ad5e7c3ca':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
 2015-06-23 18:07:44 +00:00
Lorenzo Colitti
ba7ee88cb7 am acf761eb: am e2d921da: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 
* commit 'acf761ebde2a551d8da98c3770668547148e6ec0':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
 2015-06-23 18:07:10 +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
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
Wale Ogunwale
ca1ce9382b am 781ec7e9: am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()" 
* commit '781ec7e9d408dacfab761c02d6e4b1345c5dfd87':
  Fix javadoc for Adapter.getViewTypeCount()
 2015-06-23 17:28:30 +00:00
Maxim Bogatov
2f55a3f0b8 Transfer a11y node with a11y event 
b/19870218

Change-Id: I29519d029cb7a154de09627afab7a0307abe85bd
 2015-06-23 10:23:43 -07:00
Yin-Chia Yeh
d772b5e363 Merge "Camera: document expected thumbnail size in capture result" into mnc-dev 2015-06-23 17:12:42 +00:00
Yin-Chia Yeh
5988311cbb Camera: document expected thumbnail size in capture result 
Codegen document update only.

Bug: 21880406
Change-Id: I058f6af62ff341943f7fdf6eefe8303431211970
 2015-06-23 10:11:57 -07:00
Wale Ogunwale
dd7705bbf2 Merge "Update surfaces secure flag on screen capture setting change" into mnc-dev 2015-06-23 16:49:43 +00:00
Dianne Hackborn
b74128978a Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 2015-06-23 16:46:37 +00:00
Dianne Hackborn
6af40c8338 Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 2015-06-23 16:45:50 +00:00
Wale Ogunwale
f5ad42f432 Update surfaces secure flag on screen capture setting change 
Also, added 'wm screen-capture [userId] [true|false]'
command.

Bug: 20934462
Change-Id: I14711003d7691fc4495428c12c9ff3457cd3773c
 2015-06-23 09:08:29 -07:00
Lorenzo Colitti
e2d921da29 Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 2015-06-23 14:41:57 +00:00
Michael Wright
91c8f2086f am 611136c1: am 805fc82e: Merge "Add method to set action button on MotionEvent" into mnc-dev 
* commit '611136c15c54e4c9da8deea9edf55c22cd56ec0f':
  Add method to set action button on MotionEvent
 2015-06-23 13:05:51 +00:00
Chris Wren
8471e833f6 am 2ebdeeca: am ca7febf4: Merge "add rank to notification visibility log" into mnc-dev 
* commit '2ebdeeca242212707eb4a691ca9d18a0fa60fec6':
  add rank to notification visibility log
 2015-06-23 13:05:43 +00:00
Michael Wright
805fc82ea9 Merge "Add method to set action button on MotionEvent" into mnc-dev 2015-06-23 12:48:56 +00:00
Chris Wren
ca7febf4b8 Merge "add rank to notification visibility log" into mnc-dev 2015-06-23 12:43:09 +00:00
Zoltan Szatmary-Ban
d4fafa831c am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'ddc6d37ebe7b60f5755241f343aae7ac522aef40':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:00:24 +00:00
Seigo Nonaka
d3b86919c7 am 8cc1bfe4: am 02ebcdb9: Merge "Revive Null check for backward compatibility." into mnc-dev 
* commit '8cc1bfe40efbaee6bef15c01b6767a90c3dc7845':
  Revive Null check for backward compatibility.
 2015-06-23 10:00:19 +00:00