Commit Graph

8646 Commits

Author SHA1 Message Date
Selim Cinek
b481c010e6 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev am: 60a09546c0
am: 0c8a132ea3

Change-Id: Ie7e15d7c4010c0e3cbf0081a1a4084767c83b1fa
2017-08-23 16:23:40 +00:00
Selim Cinek
0c8a132ea3 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
2017-08-23 16:07:49 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Julia Reynolds
433d3ab9f8 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0 am: 4796cf6b43
am: 30e9c9c973

Change-Id: I02a3ace673e19f738450112a9c06b1483fa648a4
2017-08-17 23:31:57 +00:00
Julia Reynolds
30e9c9c973 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f
2017-08-17 23:20:57 +00:00
Julia Reynolds
4796cf6b43 Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6
2017-08-17 23:13:29 +00:00
Julia Reynolds
c23a2e67ac Let the foreground service channel be blocked
And update the channel name

Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes: 36891897
Test: manual
2017-08-17 14:11:45 -04:00
Lucas Dupin
1d0eda938a Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee
2017-08-17 03:24:34 +00:00
Luis Hector Chavez
07f403a0ea Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c
am: 22f95dbdc0

Change-Id: I673549399e3cae4501cac77c510dbc30a5ed8163
2017-08-17 02:59:38 +00:00
Lucas Dupin
bc3a3df807 Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
am: 69bb2bae90

Change-Id: I04da1b0857fcdecf8f662936f41ddb7bc026dd21
2017-08-17 01:03:22 +00:00
Lucas Dupin
fda1152e59 Merge "API Council feedback" into oc-mr1-dev
am: 07c83d00c9

Change-Id: I115e1145b47d97b29a988133d9ec94ebe6e39637
2017-08-16 23:38:38 +00:00
Luis Hector Chavez
22f95dbdc0 Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4
am: 64f1d42e6c

Change-Id: I785676decb2fc7ddfa9034fbafdfc2deb2f07604
2017-08-16 23:11:35 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
Luis Hector Chavez
64f1d42e6c Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55
am: 755baf92b4

Change-Id: I07eb375c2b86651fd7d65f944b19161d2c977df4
2017-08-16 22:11:14 +00:00
Todd Kennedy
519b589300 resolve merge conflicts of d22603ebd2 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Luis Hector Chavez
755baf92b4 Merge "Improve container capability bounding in containers" am: 586fd52b34
am: ed05287c55

Change-Id: I6068105d31418ec7b1c89f099bf635618147c227
2017-08-16 21:43:28 +00:00
Luis Hector Chavez
ed05287c55 Merge "Improve container capability bounding in containers"
am: 586fd52b34

Change-Id: I7c67b571164e67b3e4a8ae9c9a2701e338693a4b
2017-08-16 21:32:13 +00:00
Treehugger Robot
586fd52b34 Merge "Improve container capability bounding in containers" 2017-08-16 21:16:50 +00:00
Lucas Dupin
69bb2bae90 Merge "Do not filter out some colors" into oc-mr1-dev
am: a9774680f8

Change-Id: I3208d426529d434a8ef3a1145e16fc6db566a874
2017-08-16 19:52:34 +00:00
TreeHugger Robot
a9774680f8 Merge "Do not filter out some colors" into oc-mr1-dev 2017-08-16 19:38:45 +00:00
Hugo Benichi
aef8a96dcd Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8 am: 1ada5660ce
am: d79f39689e

Change-Id: I147be11313f6d327116feb1b6807b1bd6aaba4f8
2017-08-16 18:43:48 +00:00
Todd Kennedy
cab962b8d0 Merge "Allow explicit permission denial" into oc-mr1-dev
am: 7fc53a11f8

Change-Id: I4772c35c57a9b8789417d5e04292c206a001d7e4
2017-08-16 17:41:38 +00:00
TreeHugger Robot
7fc53a11f8 Merge "Allow explicit permission denial" into oc-mr1-dev 2017-08-16 17:11:30 +00:00
Luis Hector Chavez
72042c99a6 Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.

When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.

Bug: 63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
      system_server does not request it.

Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
2017-08-16 08:21:58 -07:00
Todd Kennedy
74629e3183 Allow explicit permission denial
Change-Id: I5d348ed555f249d210253dab60ae11d4831c4f0a
Fixes: 63675512
Test: Manual
2017-08-16 14:43:05 +00:00
Hugo Benichi
d79f39689e Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8
am: 1ada5660ce

Change-Id: I5e1376137cf20127839ac043b02f256c89e7c2cc
2017-08-16 12:32:51 +00:00
Hugo Benichi
1ada5660ce Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327
am: 63fdcd08f8

Change-Id: Ie901f6770c2aa9b95f6ccdd9a78bee8d44a0d041
2017-08-16 12:23:15 +00:00
Hugo Benichi
63fdcd08f8 Merge "More OWNERS file for core networking team" am: 2827f21740
am: 1da7985327

Change-Id: Ieb04d616adf0969d2f4f468bf93fdc4b0aac75c5
2017-08-16 12:10:19 +00:00
Hugo Benichi
1da7985327 Merge "More OWNERS file for core networking team"
am: 2827f21740

Change-Id: Icae3bc4dbb2cd094c728d98aea02d4009aaa0e0b
2017-08-16 11:57:50 +00:00
Hugo Benichi
b8f1e4e6e4 More OWNERS file for core networking team
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
2017-08-16 18:40:07 +09:00
Lucas Dupin
e2efebc8a2 Do not filter out some colors
Colors specified manually using the public WallpaperColors
constructor should not be blacklisted.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I96faf413e3629c247220d825bb7c3480ed2f1003
Fixes: 64361146
2017-08-15 11:30:19 -07:00
Lei Yu
ebd39077b5 Merge "Write currentDuration into Parcel" into oc-mr1-dev am: bd6ff3d3e5
am: 240a70f1e5

Change-Id: If1adf2162182fa178d6ea01989a57e96a9411ebe
2017-08-14 22:54:36 +00:00
Lei Yu
240a70f1e5 Merge "Write currentDuration into Parcel" into oc-mr1-dev
am: bd6ff3d3e5

Change-Id: Ibaf3f44a9449a4f92abf3359fba8329f1cbca245
2017-08-14 22:38:04 +00:00
Lei Yu
bd6ff3d3e5 Merge "Write currentDuration into Parcel" into oc-mr1-dev 2017-08-14 22:28:26 +00:00
Fyodor Kupolov
0aef1c98c9 Merge "Log timings for shutdown stages" into oc-mr1-dev am: fe97799d5d
am: 34cac26ea4

Change-Id: Ifedc47b10e7542a0f28bbee1ac00490513cc0e5f
2017-08-14 21:25:01 +00:00
Fyodor Kupolov
34cac26ea4 Merge "Log timings for shutdown stages" into oc-mr1-dev
am: fe97799d5d

Change-Id: Iee66b180ecec69872ac2e96bb943e9d02afc33df
2017-08-14 21:10:59 +00:00
Fyodor Kupolov
6e3461b67c Log timings for shutdown stages
Renamed BootTimingsTraceLog to TimingsTraceLog. It is now used for
 boot and shutdown logging.

Added measurements for main stages of shutdown in the system server:
ShutdownTiming: SendShutdownBroadcast took to complete: 734ms
ShutdownTiming: ShutdownActivityManager took to complete: 203ms
ShutdownTiming: ShutdownPackageManager took to complete: 17ms
ShutdownTiming: ShutdownBt took to complete: 533ms
ShutdownTiming: ShutdownRadio took to complete: 534ms
ShutdownTiming: ShutdownNfc took to complete: 1536ms
ShutdownTiming: ShutdownRadios took to complete: 1538ms
ShutdownTiming: ShutdownStorageManager took to complete: 906ms
ShutdownTiming: SystemServerShutdown took to complete: 3918ms

Bug: 64569080
Test: shutdown/reboot and check logs
Change-Id: I636c045852cd1ed6be1c58af6608f70e95756389
2017-08-14 11:23:29 -07:00
Sudheer Shanka
b8ad594300 Use cpu freq times to calculate power consumed by an uid.
Initially we used to approximate times spent by an uid at a particular
freq using total time spent by the uid but since now the freq times
are directly available from the proc file, we can use these to
calculate power.

Bug: 62240247
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest
Test: Used some apps and verified that battery usage is attributed to
      those apps in Battery settings.
Change-Id: Ia8e2eb07fd778b8a8c83a6acec711e7b97aefdc0
2017-08-11 00:04:50 -07:00
Sudheer Shanka
76974ee41e Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
am: 3cb64c2c51

Change-Id: I80f8971b0f0f55ce91a0e1a3d574ae4a577f9257
2017-08-11 01:18:34 +00:00
Sudheer Shanka
3cb64c2c51 Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev 2017-08-11 01:05:43 +00:00
jackqdyulei
610a0a09f2 Write currentDuration into Parcel
This cl writes currentDuration to Parcel, so in battery settings we could
use this data in anomaly detection.

Also note that in getTotalDurationMsLock(aka method1), the logic is:

result = mTotalDurationMs + getCurrentDurationMsLocked(aka method2)

Since now method2 is not zero, we also tweaked the value for
mTotalDurationMs to make method1 return the same value compared with
before.

Since getMaxDurationMsLocked depends on mNesting, which is always zero,
so we don't need to tweak value for mMaxDurationMs

All these methods are covered in BatteryStatsDurationTimerTest

Bug: 64255589
Test: runtest -x BatteryStatsTest
Change-Id: I9168be099d00bb68fedbc5bfbb7bf7f0d9aae85a
2017-08-10 16:44:30 -07:00
Sudheer Shanka
a87245d305 DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
Bug: 62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d
2017-08-10 15:36:47 -07:00
Narayan Kamath
c920506d01 Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev am: 57ae4db225
am: 9ed2834cba

Change-Id: Idb3ce60318983a926c615cd0fdca3b700da3902c
2017-08-10 15:52:02 +00:00
Narayan Kamath
9ed2834cba Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
am: 57ae4db225

Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6
2017-08-10 15:41:36 +00:00
Narayan Kamath
57ae4db225 Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev 2017-08-10 15:34:22 +00:00
Narayan Kamath
590b90f533 ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e.
Bug: 64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f
2017-08-10 12:15:17 +01:00
Dianne Hackborn
47d8634cb7 Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev am: c75f43c1ab
am: a6a33976a3

Change-Id: I0086f082e8d7b74f64dc9e762048e4f0e9579812
2017-08-10 04:53:22 +00:00
Dianne Hackborn
a6a33976a3 Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev
am: c75f43c1ab

Change-Id: Icf9405de74c4d137b9c8cd0981846a08862ef231
2017-08-10 04:43:52 +00:00
TreeHugger Robot
c75f43c1ab Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev 2017-08-10 04:35:09 +00:00
Makoto Onuki
2eee04d2c2 Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev am: 75590ffa84
am: bb4f580494

Change-Id: I204695ecd43fe86eb6837098556aa1e7c0db354f
2017-08-10 01:33:09 +00:00