Commit Graph

8531 Commits

Author SHA1 Message Date
Lucas Dupin
23789bc947 Merge "Multi-user and WallpaperColors" into oc-mr1-dev am: 22b418448b
am: 430d7450ed

Change-Id: I65ff692f77886bfed6f64ec71f0bab569a6354c0
2017-08-03 16:46:16 +00:00
Sudheer Shanka
d0b09dc73d Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked." 2017-08-03 05:53:03 +00:00
Lucas Dupin
50ba991655 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 18:34:00 -07:00
Sudheer Shanka
3838323df6 Refactor BatteryStatsImpl.updateCpuTimeLocked.
Bug: 62240247
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: I666c44ef9cb4e0720564b161da0ff1c94f15d5b9
2017-08-02 18:22:04 -07:00
TreeHugger Robot
8f7637d717 Merge "Add metadata support to MTP docs provider." 2017-08-02 18:44:41 +00:00
Steve McKay
5a10ff1828 Add metadata support to MTP docs provider.
Remove convenience method from DocumentsProvider, clients to use MetadataReader directly.
Concentrate mimetype checking in MetadataReader.isSupportedType.
Update FileSystemProvider to use MetadataReader directly.

Test: Updated mtp tests. Other functioanlity manually verified.
Change-Id: Ie1e3d3092b53107f6c980c18b1451290dd2a9653
2017-08-02 09:45:26 -07:00
Julian Mancini
6d091d6c7d Remove PDF Thumbnail functionality
Bug: 64225798
Test: Removing Functionality
Change-Id: Id02f1b50d161c6f2779c9f65c579383c18028b65
2017-08-01 13:34:13 -07:00
Calin Juravle
565cab11ff Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
* changes:
  Use the class loader context when optimizing secondary dex files
  Add DexClassLoader to the list of supported class loaders
2017-08-01 18:38:05 +00:00
Geoffrey Pitsch
4433cc6b69 Merge "Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1df am: 7662de2771" into oc-mr1-dev-plus-aosp
am: 6f20add23d

Change-Id: I9719d3784703184c5053dd49e4ce6dfed3134539
2017-08-01 14:26:05 +00:00
Geoffrey Pitsch
5c2e57c718 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1df
am: 7662de2771

Change-Id: Ib93c18b5b04030d8b0840ce8a813bd57a982e1d0
2017-08-01 14:16:46 +00:00
Geoffrey Pitsch
d536ba3f41 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: Ib0c2a708e2556fc604631891666b70a841a1129a
2017-08-01 14:09:10 +00:00
Geoffrey Pitsch
7662de2771 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08
2017-08-01 14:08:36 +00:00
Geoffrey Pitsch
3ba2623ffe Disable AOD when accessibility color inversion is on.
White background drains too much to be always on.

Bug: 62918778
Test: Manual
Change-Id: I78b2f6a5951b108aff4f353dabe2493117032dce
2017-07-31 13:55:59 -04:00
Lucas Dupin
86c69c1ef2 Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8 am: 58d7a76e8d
am: bba6a4c9df

Change-Id: Id04a4f86046122b64f77294acd4f336da8c136cd
2017-07-29 23:31:41 +00:00
Lucas Dupin
835f5e41de Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
2017-07-29 23:17:49 +00:00
Lucas Dupin
58d7a76e8d Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
2017-07-29 23:17:49 +00:00
TreeHugger Robot
969cdb3d9a Merge "Remove "tags" arg from getDocumentMetadata." 2017-07-28 20:01:57 +00:00
Julian Mancini
594eb9b38d Merge "Allow PDF Thumbnails off of Debuggable builds" 2017-07-28 17:07:53 +00:00
Lucas Dupin
9324aa926a Scrim opacity must satisfy GAR
Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java
2017-07-28 10:07:04 -07:00
Julian Mancini
221034e748 Allow PDF Thumbnails off of Debuggable builds
Bug: 63822148
Test: In place
Change-Id: I3798890a8b7748cb327c8318b6ac3be67a00221e
2017-07-27 13:51:15 -07:00
Steve McKay
17a9ce333d Remove "tags" arg from getDocumentMetadata.
It didn't lend it self naturally to the multi-metadata return type and was complicating further adoption of the feature in system providers.

Test: manual
Change-Id: I2dde59c7e9609a205614f715c7383b653fa83111
2017-07-27 13:37:14 -07:00
Etan Cohen
ceb0cae7ba Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev am: 5b81cfe83c
am: 8c84e0f757

Change-Id: I0804ab42e73bff7d9c5a872fb6d58488176a2b0d
2017-07-27 18:32:41 +00:00
TreeHugger Robot
5b81cfe83c Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev 2017-07-27 18:07:19 +00:00
Lucas Dupin
d7e4a4dbdd Merge "Add theme variables to SysUI dump" into oc-dr1-dev am: 4451b6ae19 am: 3a5550a3be
am: a5dbda0b36

Change-Id: Ia80a4e6197c02d34ad4069a87a63919ac7cc7de6
2017-07-27 17:10:21 +00:00
Lucas Dupin
3a5550a3be Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am: 4451b6ae19

Change-Id: Ia176aeafa9c9e2d0b979a472bb444657b4417ab9
2017-07-27 16:49:50 +00:00
Lucas Dupin
98c63ca9ac Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am: 4451b6ae19

Change-Id: I1549a77346b4c7c417ba2fa7a2b77a9b0ea2ea2a
2017-07-27 16:49:49 +00:00
Lucas Dupin
8a4522dceb Add theme variables to SysUI dump
Dumping current themes and scrim states to make debugging easier.

Bug: 63890571
Test: adb bugreport # look for new variables
Change-Id: Ia9bfd1b91d8d2c19930cb896d337ecdfa776e6cb
2017-07-26 21:48:06 -07:00
Etan Cohen
50edf1efa5 [P2P][AsyncChannel] Revert client registering for service death
This effectively reverts 19c4883c85.

The change added a binder death listener on a peer of the AsyncChannel.

Issue: as specified in the bug - this causes a memory leak in apps
using WifiP2pManager (and possibly other clients using AsyncChannel).
The issue is that a reference to the caller is now kept by the death
listener. This means that the caller object cannot be gc'd. This
impacts WifiP2pManager since it didn't have an explicit close() method.

The original reason for the change was to enable clean-up - this can
be done in an alternative mechanism by passing-in a binder from client
to service. Will be enable in a subsequent CL.

Bug: 37443149
Test: all p2p tests, memory usage with test app
Change-Id: Iff044a8cc9c2fc0bc57db4a218b80d0b12424ddd
2017-07-26 16:22:46 -07:00
TreeHugger Robot
c58e47cfdc Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev 2017-07-26 18:59:13 +00:00
Roozbeh Pournader
6ba82998e2 Merge "Refactor ellipsis attributes and methods" 2017-07-26 00:14:06 +00:00
Selim Cinek
80736c0769 Merge "Merge "Changing the way the media image scales" into oc-dr1-dev am: e06e3f97fc am: d0644e4493" into oc-mr1-dev-plus-aosp
am: 7971baaed4

Change-Id: Ibd1d52b9ca00b9edd34f0b37b11a4d37d6573543
2017-07-25 23:51:32 +00:00
Selim Cinek
d0644e4493 Merge "Changing the way the media image scales" into oc-dr1-dev
am: e06e3f97fc

Change-Id: I60cd55a9d8ef2de15aa1f268f42923955c9d050c
2017-07-25 23:10:20 +00:00
Selim Cinek
49cdbaa25f Merge "Changing the way the media image scales" into oc-dr1-dev
am: e06e3f97fc

Change-Id: I667f1ec67a02c5ae264115a5b8bbe06dedda1d34
2017-07-25 23:04:53 +00:00
Selim Cinek
e06e3f97fc Merge "Changing the way the media image scales" into oc-dr1-dev 2017-07-25 22:45:55 +00:00
Lucas Dupin
f9d0d007ab Merge "resolve merge conflicts of a1f64b0a91 to oc-mr1-dev" into oc-mr1-dev am: fb4da9ea55
am: 58f6bf9f59

Change-Id: Ie1e285fbd00b550cba0e979dd245aa0f06ff0dcf
2017-07-25 22:40:42 +00:00
TreeHugger Robot
fb4da9ea55 Merge "resolve merge conflicts of a1f64b0a91 to oc-mr1-dev" into oc-mr1-dev 2017-07-25 22:21:29 +00:00
Roozbeh Pournader
9ea756fa70 Refactor ellipsis attributes and methods
Mostly changed to avoid repetition of code and remove the assumptions
about ellipsis being one code unit. The code for multi-code unit
ellipsis is not triggered yet, but is done in preparation for
potential future locale-dependent cases.

Test: bit CtsTextTestCases:*
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.AutoCompleteTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.MultiAutoCompleteTextViewTest
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id1dfdc503f87fabed2447d55ab2107eee0eccd08
2017-07-25 14:50:18 -07:00
TreeHugger Robot
4a2a895043 Merge "Dump print manager as proto" 2017-07-25 21:35:49 +00:00
Calin Juravle
f8c14e920e Add DexClassLoader to the list of supported class loaders
DexClassLoader have the same behavior as PathClassLoader and is still in
use by apps. Add it to the list of supported class loaders so that it can be
recognized during secondary dex file loads.

Bug: 38138251
Bug: 36044779

Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

(cherry picked from commit d08b3156e8)

Change-Id: If02081d29f4d8ac917dacd877eb75985ea3895a9
2017-07-25 14:19:14 -07:00
Sudheer Shanka
a5e36b158f Merge "Track per-cluster times of each uid in microsec." 2017-07-25 20:51:24 +00:00
Lucas Dupin
ef15776aaf resolve merge conflicts of a1f64b0a91 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
2017-07-25 12:00:01 -07:00
Philip P. Moltmann
c0a128dc2b Dump print manager as proto
Test: incident_report print. Having no entries
Change-Id: I3c7d611e44c0d3bf8e00775b1708bd82a334121a
2017-07-25 11:32:24 -07:00
TreeHugger Robot
36d8b489d2 Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev 2017-07-25 18:09:42 +00:00
Lucas Dupin
667c29d0be Merge "Fix jank when switching themes" into oc-dr1-dev
am: a1f64b0a91

Change-Id: I60c1b404b4b3a673cd3bf44f36deed546965f9cc
2017-07-25 17:47:47 +00:00
TreeHugger Robot
a1f64b0a91 Merge "Fix jank when switching themes" into oc-dr1-dev 2017-07-25 17:40:02 +00:00
Calin Juravle
bfb00badf6 Merge "Add DexClassLoader to the list of supported class loaders" 2017-07-25 17:10:49 +00:00
Calin Juravle
d08b3156e8 Add DexClassLoader to the list of supported class loaders
DexClassLoader have the same behavior as PathClassLoader and is still in
use by apps. Add it to the list of supported class loaders so that it can be
recognized during secondary dex file loads.

Bug: 38138251
Bug: 36044779

Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

Change-Id: I88617c446c0471ffa8daffa5bc1961785910005a
2017-07-25 17:08:55 +00:00
Calin Juravle
96995bb7a2 Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev 2017-07-25 16:54:06 +00:00
Andreas Gampe
032a929542 Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.

Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.

(cherry picked from commit 27497c6dfc)

Bug: 63904739
Bug: 63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
2017-07-24 19:59:13 -07:00
Ajay Panicker
4e38307433 Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev am: aaf3860941 am: 4c0900102b
am: 52c78bd5a2

Change-Id: Idd3e5b3677866fc5286bb94d12e921e70d641e9f
2017-07-25 02:36:21 +00:00