Commit Graph

266851 Commits

Author SHA1 Message Date
Andrii Kulian
cd99c37bc2 Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5
am: ae01e27755

* commit 'ae01e27755107d437bc92b1f994932c860453453':
  Update override config to include some changes from global config

Change-Id: Ie6459b34e31ea7a5a7aff40b71db0157e2fe014f
2016-06-01 01:27:28 +00:00
Lajos Molnar
880750ac14 Merge "Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: c4da6b9962" into nyc-mr1-dev-plus-aosp
am: 81dd1856ba

* commit '81dd1856badd22b88a44fc72aba12ecb83ab5824':

Change-Id: I60d4ba408260bf5cd0cb005604c4193f2018cd9d
2016-06-01 01:21:52 +00:00
Lajos Molnar
a0846251d2 Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: bf3d1fc245
am: d3560d6c05

* commit 'd3560d6c05b624ae739097fd5980787113440699':
  media: avoid recursion when evaluating profile support

Change-Id: I32a3f8c7d7f96ced191790ddfacb4405d9474a27
2016-06-01 01:21:47 +00:00
Andrii Kulian
ae01e27755 Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce
2016-06-01 01:20:50 +00:00
Andrii Kulian
a0668c7442 Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I0f1f9f64bcd81321f44c48cd01537749ac4727ea
2016-06-01 01:20:39 +00:00
Dianne Hackborn
e9a988caca Work on issue #28942589: Tune job scheduler
We now have a new settings key that provides all of the existing
tuning parameters, plus some newly redone ones for dealing with
different memory levels.

Changed the minimum batching for overall jobs from 2 to 1, so
we will never get in the way of immediately scheduling jobs
when the developer asks for this.  We should now be able to rely
on the doze modes to do better batching of jobs for us when it
is really important.

Also work on issue #28981330: Excessive JobScheduler wakeup alarms.
Use a work source with scheduled alarms to blame them on the app
whose job they are being scheduled for, and add a check for whether
a job's timing constraint has been satisfied before considering it
a possible candidate for the next alarm.  (If it is satisified,
the time is in the past, so we should not schedule an alarm for it.)

Finally clean up a bunch of the dumpsys output to make it easier
to understand.

Change-Id: I06cf2c1310448f47cf386f393e9b267335fabaeb
2016-05-31 18:16:19 -07:00
Android Build Merger (Role)
81dd1856ba Merge "Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172 am: c4da6b9962" into nyc-mr1-dev-plus-aosp 2016-06-01 01:15:55 +00:00
Lajos Molnar
7970b6ad85 Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172
am: c4da6b9962

* commit 'c4da6b99626df7d16ccd28967a4af9ccd4541e21':
  media: avoid recursion when evaluating profile support

Change-Id: I2d4105e27d4842c54015b8e51769a459eb7c4d1f
2016-06-01 01:15:22 +00:00
Lajos Molnar
d3560d6c05 Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a172
am: bf3d1fc245

* commit 'bf3d1fc24527d521c2538e4266dcb48a17bca422':
  media: avoid recursion when evaluating profile support

Change-Id: I31256b6fa3cceaafe814b0a502723a74ccf61b2a
2016-06-01 01:15:06 +00:00
Andrii Kulian
88be465ce5 Merge "Update override config to include some changes from global config" into nyc-dev 2016-06-01 01:08:37 +00:00
Lajos Molnar
c4da6b9962 Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am: a72a83a172

* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
  media: avoid recursion when evaluating profile support

Change-Id: I2ba4a9e16b1989cb05291f9db2412c61bf3e2d07
2016-06-01 01:05:47 +00:00
Lajos Molnar
bf3d1fc245 Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am: a72a83a172

* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
  media: avoid recursion when evaluating profile support

Change-Id: I41d6aac773ab5c31b700eea343d9a143934c2f6b
2016-06-01 01:05:30 +00:00
TreeHugger Robot
a72a83a172 Merge "media: avoid recursion when evaluating profile support" into nyc-dev 2016-06-01 00:58:29 +00:00
Sergei Vasilinetc
1fad63cf16 Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: 561df62a52" into nyc-mr1-dev-plus-aosp
am: 8b979155ca

* commit '8b979155caf916485da85d886e9026e9d133f735':

Change-Id: I24c3016b91309db4c3502650e76e3f1a9e4df266
2016-06-01 00:51:14 +00:00
Hall Liu
391e0214f5 Merge "Add null check in showLockTaskToast" into nyc-dev am: d7007923c5 am: 1f1f29ece6
am: 6a8cc5976a

* commit '6a8cc5976affb0f3b570250ed7e4b5777ea6ee64':
  Add null check in showLockTaskToast

Change-Id: I3aef910d2bc9b8c6efcb2deeff334f1f09e91ca6
2016-06-01 00:51:10 +00:00
Felipe Leme
05515ae925 Move DownloadsManager to permanent whitelist.
DownloadProvider is now based completely on JobScheduler, and deep
inside the platform we allow foreground
downloads (FLAG_WILL_BE_FOREGROUND) to run even while the device is in
doze, so it doesn't need to be temporarily whitelisted anymore.

BUG: 29056149
Change-Id: I3658bb42aeeee5d5528f91ec990d6e1bc54257b6
2016-05-31 17:50:39 -07:00
Sergei Vasilinetc
8bffb65356 Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: c4d91f0bbf" into nyc-mr1-dev-plus-aosp
am: f94cd49aa4

* commit 'f94cd49aa47c2f85a8810cab197f7f5e362efa8f':

Change-Id: Ifa020fd068674d91531bfe7981b9a8b843fffd58
2016-06-01 00:47:27 +00:00
sergeyv
9751618c87 Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: 6544a0e2e2
am: caeade2914

* commit 'caeade2914a4f5366ed89c3e8ba7f188434465c2':
  HWUI: do nothing in case of empty layer

Change-Id: I77de8747f9c7bed869cb1e8a2533e27f01cfe33f
2016-06-01 00:45:15 +00:00
Android Build Merger (Role)
8b979155ca Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: 561df62a52" into nyc-mr1-dev-plus-aosp 2016-06-01 00:43:10 +00:00
Sergei Vasilinetc
64d3e62cd5 Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f
am: 561df62a52

* commit '561df62a523fdc78616db66b6f24ac7b10f57eb9':
  Add null check in showLockTaskToast

Change-Id: I5d7b851dbee2de45e9f0b184e3f5eb1722707946
2016-06-01 00:42:32 +00:00
Hall Liu
6a8cc5976a Merge "Add null check in showLockTaskToast" into nyc-dev am: d7007923c5
am: 1f1f29ece6

* commit '1f1f29ece6f93b53cb44140b271927c198615113':
  Add null check in showLockTaskToast

Change-Id: I4398b476dfd86c807a452b09b789214b44e7ccdd
2016-06-01 00:40:18 +00:00
Sam Hurst
b3e7386b22 Check for null pointer before use.
Bug: 29044977
Change-Id: Ie20c656598eeb2e4700dc245c83e6a765e186117
(cherry picked from commit f384fbf05d000775b00f25fd78bda090afb088d0)
2016-06-01 00:35:44 +00:00
Android Build Merger (Role)
f94cd49aa4 Merge "Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: c4d91f0bbf" into nyc-mr1-dev-plus-aosp 2016-06-01 00:35:10 +00:00
Sergei Vasilinetc
eb1d238b2b Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f
am: c4d91f0bbf

* commit 'c4d91f0bbf9b3e85e227baf0d987ba904eefbf31':
  HWUI: do nothing in case of empty layer

Change-Id: I9e5504e9c1d57649e2d5ee1e4d02a451564b8d3c
2016-06-01 00:34:12 +00:00
Sergei Vasilinetc
caeade2914 Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f
am: 6544a0e2e2

* commit '6544a0e2e255b676770d64fa89f4f616a7021e63':
  HWUI: do nothing in case of empty layer

Change-Id: I4bfc8c0210ec97a21fd4ee4cb5ea698324c309f2
2016-06-01 00:34:04 +00:00
Hall Liu
1f1f29ece6 Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: I10339eddb06dab3acd2d2d770e4b678ef0cfe2f3
2016-06-01 00:33:45 +00:00
Hall Liu
561df62a52 Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
2016-06-01 00:33:39 +00:00
Hall Liu
d7007923c5 Merge "Add null check in showLockTaskToast" into nyc-dev 2016-06-01 00:25:05 +00:00
sergeyv
c4d91f0bbf Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am: 21a608f27f

* commit '21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
  HWUI: do nothing in case of empty layer

Change-Id: Iec199a2a20c9981922468c3a33065a86f818d833
2016-06-01 00:20:56 +00:00
sergeyv
6544a0e2e2 Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am: 21a608f27f

* commit '21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
  HWUI: do nothing in case of empty layer

Change-Id: I264e20e2290f474636a21eb7322377e308d316c2
2016-06-01 00:20:54 +00:00
Sergei Vasilinetc
21a608f27f Merge "HWUI: do nothing in case of empty layer" into nyc-dev 2016-06-01 00:15:32 +00:00
Roshan Pius
7bc7be2381 Merge "XmlUtils: Add missing readThisByteArrayXml method" 2016-06-01 00:14:23 +00:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
2016-05-31 16:41:27 -07:00
Philip P. Moltmann
63498afff8 Move Xerox recommendation plugin to service.
Only minimal changes just to make it work together with the other
plugins.

Bug: 28908572
Change-Id: Icac226b45e8a6885036466451d0e9f54a3b3c640
(cherry picked from commit d97fdfd943)
2016-05-31 23:35:17 +00:00
Philip P. Moltmann
7025a133e9 Merge "Use SkMatrix to compute pdf transformation." 2016-05-31 23:32:18 +00:00
Chris Tate
026e5173d6 Merge "Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev am: cd0aa9cda8 am: 7d45e0231e" into nyc-mr1-dev-plus-aosp
am: 8b41b7510c

* commit '8b41b7510cca40981db86640bd1c05c3a3ce8318':

Change-Id: Ieddbdbea25f365cd0e81cd1ff52d016013e6ddb6
2016-05-31 23:25:04 +00:00
Christopher Tate
21aafa2b29 Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: 494529318a
am: 09c17150f9

* commit '09c17150f95dfdde2d737049dcecb3b04a160db5':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I77e998c444e5cd92422b9e176f5c9aea8526e6ce
2016-05-31 23:25:01 +00:00
Jorim Jaggi
cc64dfcf66 Don't crash activity manager when supplying invalid URI
Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df
Fixes: 29039290
2016-05-31 23:21:30 +00:00
Android Build Merger (Role)
8b41b7510c Merge "Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev am: cd0aa9cda8 am: 7d45e0231e" into nyc-mr1-dev-plus-aosp 2016-05-31 23:19:28 +00:00
Chris Tate
f0e5e9c7dc Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev am: cd0aa9cda8
am: 7d45e0231e

* commit '7d45e0231e9358d9b30a4dfc5c76b8144beeb5bd':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I55cda3493282a252f301398be1d6218ec6edbeff
2016-05-31 23:19:01 +00:00
Jorim Jaggi
6943866181 Merge "Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: cc8707ca9a" into nyc-mr1-dev-plus-aosp
am: d7b4635d0e

* commit 'd7b4635d0edc936044a06151df47459f15ff2fdb':

Change-Id: I8c964e22c6324b9f1d2cd84481c4b2ccfdd3a558
2016-05-31 23:18:00 +00:00
Jorim Jaggi
88958c599d Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: b5952d22f0
am: ecc9e7981a

* commit 'ecc9e7981a81332ad180ab08c47c97d451adf523':
  Enforce background fallback to be non-translucent

Change-Id: I6938706512c50333b2d16be7bdec4d6807227e26
2016-05-31 23:17:54 +00:00
Jorim Jaggi
09c17150f9 Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666
am: 494529318a

* commit '494529318a0a8952ed5dc7bc00786f74f39b2612':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I23fef9e69fb5aa0ec57d32e19d1fc513611018fd
2016-05-31 23:17:32 +00:00
Christopher Tate
494529318a Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am: cd0aa9cda8

* commit 'cd0aa9cda8e57c224b473198a345fb008fe30b5a':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: Ia86b5f27d511bb8da2bd8982ffe35d4d2906da54
2016-05-31 23:13:31 +00:00
Christopher Tate
7d45e0231e Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am: cd0aa9cda8

* commit 'cd0aa9cda8e57c224b473198a345fb008fe30b5a':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I3b28a8c03cee7fe6f85540f1f679de10de09923c
2016-05-31 23:13:20 +00:00
Android Build Merger (Role)
d7b4635d0e Merge "Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: cc8707ca9a" into nyc-mr1-dev-plus-aosp 2016-05-31 23:12:57 +00:00
Jorim Jaggi
7344355e83 Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666
am: cc8707ca9a

* commit 'cc8707ca9ad276341a25c295433ed3060edb9dc3':
  Enforce background fallback to be non-translucent

Change-Id: Ic44d3b322849e51eddb0d34ee4efb090a0187e93
2016-05-31 23:12:28 +00:00
Jorim Jaggi
ecc9e7981a Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666
am: b5952d22f0

* commit 'b5952d22f098e43f97be2c6cbb3b45dddc58b81f':
  Enforce background fallback to be non-translucent

Change-Id: I6945d24fefb2ba3cec1cff21ef9226668f707536
2016-05-31 23:12:24 +00:00
Alex Klyubin
29045203f3 Use correct cert chain from PKCS#7 SignedData block.
This fixes a bug where APK JAR signature verifier returned the wrong
certificate chain. Rather than returning the cert chain of the
verified SignerInfo, it was returning the bag of certs of the PKCS#7
SignedData block.

This issue was introduced in Android N and thus does not affect
earlier Android platform versions.

Bug: 29055836
Change-Id: I684c0f8e9ff47b922030645e07b6a114c0eb0963
2016-05-31 16:10:00 -07:00
Jorim Jaggi
cc8707ca9a Merge "Enforce background fallback to be non-translucent" into nyc-dev
am: a35724f666

* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
  Enforce background fallback to be non-translucent

Change-Id: I692f30718453e03570e1512adb3b6e9fbe787197
2016-05-31 23:02:53 +00:00