Commit Graph

5823 Commits

Author SHA1 Message Date
Wei Wang
9c2b6766ba Merge "Thermal: change WARNING level to EMERGENCY" 2018-12-05 15:37:21 +00:00
TreeHugger Robot
6220baa36e Merge "Schematize vold system properties" 2018-12-05 00:00:42 +00:00
Wei Wang
caff59d3d6 Merge "Thermal: Add set-status command to turn thermal status" 2018-12-04 23:27:28 +00:00
Wei Wang
ed2c902004 Thermal: change WARNING level to EMERGENCY
Bug: 119613338
Test: atest services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
Change-Id: I3bde79a3598ef58072c8d9c2202a0eec6a968776
2018-12-04 14:48:28 -08:00
Wei Wang
cc91361106 Thermal: Add set-status command to turn thermal status
Bug: 111086696
Bug: 119413961
Test: adb shell cmd thermalservice set-status 3
Test: adb shell cmd thermalservice reset
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
Change-Id: Ide114d1aadad67cbbbae645b56c6c082aceade21
2018-12-04 13:31:42 -08:00
Jeff Sharkey
f660c012b0 Merge "Add support for "Audiobooks"." 2018-12-04 16:58:17 +00:00
Jeff Sharkey
628d2e6888 Merge "Redact location Exif tags when no permission." 2018-12-04 01:28:37 +00:00
Philip P. Moltmann
7208efc83b Merge changes from topic "LocationAccessCheck"
* changes:
  New settings for testing permission controller
  Expose API needed for apps to use work profiles.
2018-12-03 19:59:03 +00:00
Jeff Sharkey
cb39499354 Redact location Exif tags when no permission.
When the caller doesn't hold the ACCESS_MEDIA_LOCATION permission,
any location Exif tags should be redacted for privacy reasons.  We
still allow unredacted raw file access if the media is owned by the
calling app, since they should be able to see data they contributed.

Certain backup apps really want to see the original contents without
any redaction, so provide them a setRequireOriginal() API so they
get a strong exception whenever the original bits can't be provided.

Add the ability to open a redacted file for read/write access by
stopping redaction for any ranges that have been overwritten with
new data, along with tests to verify this behavior.

Extend "content" tool to bind null values.

Bug: 111892141
Test: atest android.os.RedactingFileDescriptorTest
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I47b220036a712d9d49547196b90e031b10760f84
2018-12-03 12:57:09 -07:00
Olivier Gaillard
4845430ffa Merge "Use transaction name for binder trace" 2018-12-03 18:02:36 +00:00
Jeff Sharkey
2ea404fd2a Merge "Method to determine isolated storage mode." 2018-12-01 22:37:35 +00:00
Philip P. Moltmann
a3e358cf9f Expose API needed for apps to use work profiles.
Bug: 120303361
Test: Built
Change-Id: I5e4cd1450bb284321711558a4475e872d14022ff
2018-12-01 09:32:12 -08:00
Jeff Sharkey
10887d5e5a Add support for "Audiobooks".
Bug: 113356944
Test: manual
Change-Id: Ifed54c41a533ed2d556dc6561ea498ec293991a6
2018-11-30 13:53:19 -07:00
Jeff Sharkey
10ec9d8a42 Method to determine isolated storage mode.
Mostly designed for use by tests, but start using it elsewhere in OS
for consistency.

Bug: 119713234
Test: manual
Change-Id: I803671fd84547b75337bebf00c2fa2bdaf0f72e7
2018-11-30 10:52:02 -07:00
TreeHugger Robot
8faacd383d Merge "add android.os.Process.getRss()" 2018-11-30 01:16:38 +00:00
TreeHugger Robot
a248a6a08b Merge "Revert "Revert "support work chain in pulled atoms""" 2018-11-29 01:35:51 +00:00
Chenjie Yu
d7e3a228be Revert "Revert "support work chain in pulled atoms""
This reverts commit 9c7b131996.

Reason for revert: Fixed build failures due to merge

Change-Id: I7d7bfed3a3234b966f3fe3fd6e0cbc63d2bedf83
Test: unit test
2018-11-28 15:53:09 -08:00
TreeHugger Robot
5ded9e4ff4 Merge "Fix a comment on PowerManager.dream to indicate all required permissions" 2018-11-28 21:41:25 +00:00
Fabian Kozynski
e3b92ab6ba Merge "Revert "support work chain in pulled atoms"" 2018-11-28 20:32:50 +00:00
Fabian Kozynski
9c7b131996 Revert "support work chain in pulled atoms"
This reverts commit ce8e4dce60.

Reason for revert: breaking multiple targets in master

Change-Id: I3ee74b314e06cb2c4d3d6da82ca116a91aad67d4
2018-11-28 20:13:22 +00:00
Chenjie Yu
fbc5842d16 Merge "support work chain in pulled atoms" 2018-11-28 19:10:30 +00:00
Tim Murray
fb07678985 add android.os.Process.getRss()
This is necessary for low-impact logging useful for training.

Test: gets RSS correctly
bug 119789589

Change-Id: Ie32202ff9280208dbe967a22883d8ed1198fa724
2018-11-28 10:45:18 -08:00
Olivier Gaillard
7c94c8417d Merge "Tests for binder work source propagation" 2018-11-28 08:59:12 +00:00
Oleg Kibirev
c9752ebb0f Fix a comment on PowerManager.dream to indicate all required permissions
Bug: 119130690
Test: not needed
Change-Id: Ib4fff5c5b3507c9f5bda7b97d8e76178b7335bab
2018-11-27 13:29:54 -08:00
TreeHugger Robot
0f94603082 Merge "Rename ANGLE package name" 2018-11-27 17:46:02 +00:00
Jeff Sharkey
a789183401 Merge "Iterate on storage permissions model." 2018-11-27 15:51:14 +00:00
Olivier Gaillard
1d72458192 Tests for binder work source propagation
Test: atest binderLibTest BinderWorkSourceTest
Change-Id: I7265388c96076f8fcd44e02df493d3eec8e96b14
2018-11-27 14:36:46 +00:00
Jeff Sharkey
9787a9459d Iterate on storage permissions model.
This change updates the permissions design to use app-ops for
controlling write access, which is only extended to the default app
for a particular collection type.

Bug: 119713234
Test: atest android.appsecurity.cts.PermissionsHostTest
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I40811ff175b3b8410b58ed901948a23a56f8a8c2
2018-11-26 12:00:35 -07:00
Martijn Coenen
66213de907 Restrict dumping of binder proxy info in bugreports.
This dumping is done with the ActivityManagerService lock held, and
can take a while. Therefore, do the dumping without the lock, and
only dump proxy interface counts if the number of proxies looks
unreasonable to start with.

Bug: 119616995
Test: boots, bugreport doesn't dump proxy interfaces with normal count
Change-Id: If7ca8fbe08362db2ef57bf2e210160f37859fd79
2018-11-26 13:18:28 +01:00
Abodunrinwa Toki
d531f70d30 Merge "ConversationActions Config installer." 2018-11-22 16:02:54 +00:00
Wei Wang
2ca566b525 Merge "Add thermal status API for app and unit test" 2018-11-21 18:34:49 +00:00
Courtney Goeltzenleuchter
8b9ffcb075 Rename ANGLE package name
Test: manual: verify package name loads

Change-Id: I9202674011d9b1bf6c67cfc9c3b4318ded3a3656
2018-11-21 10:39:01 -07:00
Abodunrinwa Toki
f438e14dfd ConversationActions Config installer.
This installs model updates for smart reply/actions
aka conversation actions.

Test: none
Bug: 111437455
Bug: 111406942
Change-Id: I9cb04e7b20b565ac5d128475a90bd065c805e95e
2018-11-21 17:33:53 +00:00
Chenjie Yu
ce8e4dce60 support work chain in pulled atoms
+ also rewrite map and merge isolated uid to host uid.

output:
Pull from 10014: { 1541137009000000000 10430748770707
(10014)0x2010101->1[I] 0x2010182->lala1[S] 0x2010201->2[I]
0x2018282->lala2[S] 0x20000->10430750[L]  }

Bug: 119043339
Bug: 117975376
Test: unit test
Change-Id: Ib6e3ea0f76594438ee1b3e12e965d85fefb405d7
2018-11-20 16:15:31 -08:00
Wei Wang
37b175448a Add thermal status API for app and unit test
Test: Manually on Thermal HAL 2.0 device
Test: Manually on Thermal HAL 1.1 device
Test: Manually on no Thermal HAL emulator
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
Bug: 111086696
Bug: 119413961
Change-Id: I6723406123d12339e82e9e87eec14b7f9a301897
2018-11-20 11:56:30 -08:00
Olivier Gaillard
b4bbd2c8a8 Merge "Update documentation for ThreadLocalWorkSource." 2018-11-19 17:42:05 +00:00
Olivier Gaillard
a50fdae610 Update documentation for ThreadLocalWorkSource.
Test: unit test
Change-Id: I446af267dafd069b1bf5f64a84347b69fc6fec60
2018-11-19 15:28:49 +00:00
Olivier Gaillard
e7ce49d152 Merge "Rename WorkSource methods on Binder and IPCThreadState." 2018-11-19 11:01:23 +00:00
Oleg Kibirev
2d281dfe63 Merge "Add a PowerManager @SystemApi to start a dream" 2018-11-16 21:38:34 +00:00
Oleg Kibirev
2385b5ef7e Add a PowerManager @SystemApi to start a dream
go/startdream

This is a simplier alternative to ag/5460565

Bug: 119130690
Test: Use of API from launcherX
Change-Id: I9b8e1dc04095045077c37014290120efec9dc331
2018-11-15 12:54:02 -08:00
Adam Bookatz
0dee99a7c7 Merge "Statsd atom: Power Use" 2018-11-15 20:20:08 +00:00
Hirono Shiyama
0f7882988f Merge "[BatteryStats] Correct formatter for pkginst in battery stats." am: 2c250e322b am: b6aa42807c
am: a3e91325a6

Change-Id: I16884ec77b77c0a24665b7e58374670e850ebd6d
2018-11-15 06:27:20 -08:00
Steven Moreland
188a74f8ba Merge "ParcelFileDescriptor: warn about comm int coupling." am: 22350fbefb am: 74090dbefa
am: 19e666a4fc

Change-Id: I9dbe8ea16bdddad89fcc8084195949654c57ae86
2018-11-15 05:38:54 -08:00
Ben Murdoch
0b81b12892 Merge changes from topics "appfuse-revert", "appfuse"
* changes:
  Revert "cheets: Delegate openAppFuseFile operation to vold"
  resolve merge conflicts of 6c9537dc7f to master
2018-11-15 13:19:16 +00:00
Olivier Gaillard
d542b1c3c6 Rename WorkSource methods on Binder and IPCThreadState.
This change only renames methods, there is no behavior changes except
using the new restore methods instead of clear.

Test: unit tests
Change-Id: I35ae966461657e2e2a67e916d752b9ee53381c83
2018-11-15 09:56:37 +00:00
TreeHugger Robot
b1c6ba026d Merge "Statsd uidmap includes vers string and installer" 2018-11-15 08:56:28 +00:00
Bookatz
75ee604244 Statsd atom: Power Use
BatteryStats calculates power usage of the device and various components
(such as apps). This information is used, e.g., in the battery panel of
Settings. We now log it to statsd. It can be used for validating how
good the information displayed in Settings is. In the long-term, it is
likely not ideal for off-device calculations, since that can be
hopefully estimated using statsd's raw data.

Three atoms: one for the total power use, one for the power use of each
uid, and one for each non-uid component. Since they will all likely be
pulled together, StatsCompanionService will provide stale data for
BatteryStats pulls called within a second of a previous BatteryStats
pull.

Also in this cl:
Remove StatsLogEventWrapper.writeDouble. Statsd doesn't support actually
writing doubles into its proto reports, so having this function is
misleading (the data will get to statsd and then be completely ignored).
It's less confusing if we don't pretend it does something.

Change-Id: If80bab8ea938afa4632535bb88ff59879fbe8099
Fixes: 119111972
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases -t android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerUse
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases -t android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerBlameUid
Test: BatteryStatsHelperTest#testDrainTypesSyncedWithProto
2018-11-14 18:13:58 -08:00
Hirono Shiyama
a3e91325a6 Merge "[BatteryStats] Correct formatter for pkginst in battery stats." am: 2c250e322b
am: b6aa42807c

Change-Id: I53c8883ef14106d5bda42f1361af3e7153dd9ad1
2018-11-14 16:31:19 -08:00
Treehugger Robot
2c250e322b Merge "[BatteryStats] Correct formatter for pkginst in battery stats." 2018-11-14 23:53:42 +00:00
Steven Moreland
19e666a4fc Merge "ParcelFileDescriptor: warn about comm int coupling." am: 22350fbefb
am: 74090dbefa

Change-Id: I916b81bcf0388316adb3dc8a79a4e03168eca661
2018-11-14 13:29:12 -08:00