Commit Graph

5352 Commits

Author SHA1 Message Date
fionaxu
907f3cd76b Merge "add install action for carrier id to system API" into pi-dev
am: 689866352b

Change-Id: I472e17218bfe5bcb3178ff6da87910812b17a4dc
2018-05-09 16:08:26 -07:00
TreeHugger Robot
689866352b Merge "add install action for carrier id to system API" into pi-dev 2018-05-09 22:47:40 +00:00
fionaxu
2776ed56b8 add install action for carrier id to system API
Bug: 79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
2018-05-08 15:25:40 -07:00
android-build-team Robot
ccb89f9263 Merge "Adding batterystats history to proto dump." into pi-dev
am: 291b944d89

Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
2018-05-08 08:11:22 -07:00
android-build-team Robot
291b944d89 Merge "Adding batterystats history to proto dump." into pi-dev 2018-05-08 14:58:09 +00:00
Kweku Adams
71a9531806 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

Bug: 77727638
Test: flash device and check output of incident proto and
'dumpsys batterystats -c --history'

Merged-In: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
Change-Id: Ia0c993d1281cc350d93f9c13f5540b349a4bfb84
2018-05-07 17:53:57 -07:00
Howard Ro
e68a729b08 Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev
am: 7ca1b03ece

Change-Id: If52d4b0f2b648e118e9cf10705b4eb2068153b75
2018-05-07 14:56:40 -07:00
yro
be6d7f90e8 Re-enable the logging of APP_BREADCRUMB_REPORTED atom
Bug: 78613419
Test: manual, cts, unit tests
Change-Id: I279158c8031eda3ee648053ae6a0d13fde7f1176
2018-05-06 22:25:05 -07:00
android-build-team Robot
c1d985cf8b Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev
am: ec41a069fd

Change-Id: If18ec5d227a70e070a1a66d9a229de04d986d27f
2018-05-03 20:03:53 -07:00
android-build-team Robot
ec41a069fd Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev 2018-05-04 02:43:03 +00:00
Yangster-mac
892f3d3229 Reset statsd and correctly record the dump reason when system
server restarts/crashes.

Test: statsd test
BUG: b/79161505
Change-Id: I0646c764964f6eafde91f9ae0179a1c837af320d
2018-05-03 17:05:24 -07:00
Benjamin Miller
fa34b6a997 Merge "Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps." into pi-dev
am: 297965f29e

Change-Id: I57d55527a6e6019a3310536df49ee8fb28d8780c
2018-05-03 07:41:48 -07:00
Benjamin Miller
297965f29e Merge "Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps." into pi-dev 2018-05-03 14:08:54 +00:00
Benjamin Miller
f1c3ed1e81 Docs: noted that DISALLOW_INSTALL_APPS prevents DPCs installing apps.
Bug: 72428023
Test: make ds-docs and inspect output
Change-Id: Ifc31378b7061d10b73de183e3c64864d608975b1
2018-05-03 11:24:44 +00:00
Jeff Sharkey
1394fd25ca Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
am: f7d3e028ae

Change-Id: I61692ebdc49233923863ce773bb42a07498551b0
2018-05-02 14:29:10 -07:00
Jeff Sharkey
f7d3e028ae Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev 2018-05-02 21:14:17 +00:00
Jeff Sharkey
b00d5ea59a Return to modifying raw /mnt/media_rw paths.
We thought we could push everyone through sdcardfs, but secondary
devices mounted in a stable location don't give full write access to
apps holding WRITE_EXTERNAL_STORAGE, so system internals still need
to reach behind sdcardfs.

To keep sdcardfs in the loop about changes that we make behind its
back, we issue access(2) calls which should be enough for it to
invalidate any cached details.

Bug: 74132243
Test: manual
Change-Id: I727cd179a5a825b16ec4df6e2f41a079758d41c5
2018-05-01 10:03:18 -06:00
Makoto Onuki
d539b18694 Merge "Log slow message delivery on Looper" into pi-dev
am: 14186bfe08

Change-Id: I2fa94b76b01180f28f0a6ecf46daedadee1a81e3
2018-04-30 11:03:23 -07:00
Makoto Onuki
14186bfe08 Merge "Log slow message delivery on Looper" into pi-dev 2018-04-30 17:50:58 +00:00
Makoto Onuki
712886fd97 Log slow message delivery on Looper
Sample log:
04-27 15:30:17.306  1000   942   942 W Looper  : Dispatch took 222ms on main, h=Handler (com.android.server.job.JobSchedulerService$JobHandler) {42042fc} cb=null msg=7 start=48162 end=48384
04-27 15:30:17.306  1000   942   942 W Looper  : Delivery took 235ms on main, h=Handler (com.android.server.job.JobSchedulerService$JobHandler) {42042fc} cb=null msg=4 start=48149 end=48384
04-27 15:30:17.773  1000   942   942 W Looper  : Dispatch took 445ms on main, h=Handler (android.app.ActivityThread$H) {5df4c77} cb=android.app.-$$Lambda$LoadedApk$ReceiverDispatcher$Args$_BumDX2UKsnxLVrE6UJsJZkotuA@badd538 msg=0 start=48406 end=48851
04-27 15:30:17.828  1000   942   942 W Looper  : Drained
04-27 15:30:24.389  1000   942   942 W Looper  : Dispatch took 718ms on main, h=Handler (android.hardware.soundtrigger.SoundTriggerModule$NativeEventHandlerDelegate$1) {d7e9947} cb=null msg=4 start=54749 end=55467
04-27 15:30:24.389  1000   942   942 W Looper  : Delivery took 621ms on main, h=Handler (com.android.server.media.MediaSessionRecord$MessageHandler) {5851574} cb=null msg=7 start=54846 end=55467
04-27 15:30:24.499  1000   942   942 W Looper  : Drained

Bug: 78590632
Test: Boot and check log
Test: setprop log.looper.1000.android.bg 1 and runtime-restart and check log
Change-Id: Ief1fc65b40b8a3d583879f55a76288e3dba6be7d
2018-04-27 17:15:46 -07:00
Makoto Onuki
f29cd1b9b9 Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev
am: 640d4d5f43

Change-Id: I19f22ba45a3dd84f96d395fe95df9081b8d62166
2018-04-26 18:51:52 -07:00
TreeHugger Robot
640d4d5f43 Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev 2018-04-27 01:36:52 +00:00
Makoto Onuki
6bdd4aca96 Fix PersistableBundle C++ -> Java interop
PersistableBundle.java expects items to be sorted by the hash codes
of the keys, but PersistableBundle.cpp isn't compatible to it.

PersistableBundle.java now knowns what was parceled by C++
because it now uses a different magic, and change the unpercel
strategy.

Change-Id: Ia516f80b6d48dcb9f981767e0e64303434f39fb4
Fixes: 65744965
Test: adb shell sm fstrim and check logcat
2018-04-26 16:35:38 -07:00
Mika Raento
904e3349a6 Merge "Systrace support for NNAPI" am: ecb0302ae9
am: ae359622a6

Change-Id: I7e7ae0ff8560368cdb5719550876ea68630eac84
2018-04-26 11:24:39 -07:00
Alexey Kuzmin
94babdc406 Merge "Default vibration amplitude resolution added" into pi-dev
am: 39cfdf1325

Change-Id: Ib14c3c9cdaf3e9217bcbd6b6238a8840cb11a8cc
2018-04-26 09:54:14 -07:00
Alexey Kuzmin
59efe9734e Default vibration amplitude resolution added
Test: On sailfish, set vibration intensity to High, lock the phone and
unlock with FPS. Vibration should be played.
Bug: 76129874

Change-Id: I546341e55fa0e6de0af1d22c8e8e07d67670f0b9
Merged-In: I546341e55fa0e6de0af1d22c8e8e07d67670f0b9
2018-04-26 16:27:06 +01:00
Mika Raento
6a30ff8326 Systrace support for NNAPI
Change-Id: Ie73d28937eba33e2d90f1447f17fd6d8e5719a65
Bug: 78137932
Test: mm
2018-04-26 09:34:12 +01:00
Jeff Sharkey
64a615eefe Merge "Extend adoptable override to force on or off." into pi-dev
am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039
2018-04-20 17:20:16 -07:00
Jeff Sharkey
901c04270f Extend adoptable override to force on or off.
Virtual disks are adoptable by default, but for debugging purposes
we want to treat them as unadoptable in some cases.  Add the ability
for the "sm" shell command to force on/off, or return to default.

Bug: 77849654, 74132243
Test: manual
Change-Id: Ieda317396624ca081e5dd9568795483f684f9297
2018-04-20 13:11:23 -06:00
Mathew Inwood
9e2b236462 Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
am: c72ee1a4f2

Change-Id: If0db894c3cb9660eb187280cda21423866387799
2018-04-20 01:20:19 -07:00
Mathew Inwood
c72ee1a4f2 Merge "StrictMode: fix non-SDK API usage detection." into pi-dev 2018-04-20 08:04:07 +00:00
Mike Ma
7351e73b96 Merge "Fix screen on count text dump" into pi-dev
am: dd61c7e8e7

Change-Id: Ia2072936a3c02516a4f3add73895ee8e291cdc04
2018-04-19 13:29:13 -07:00
TreeHugger Robot
dd61c7e8e7 Merge "Fix screen on count text dump" into pi-dev 2018-04-19 20:16:28 +00:00
Chong Zhang
cadb0d5ec8 Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev
am: 3f8884829f

Change-Id: Ib1cc2013127f59af33482c4924faa869b3cb7fb9
2018-04-19 11:22:34 -07:00
TreeHugger Robot
3f8884829f Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev 2018-04-19 17:40:39 +00:00
Mathew Inwood
96b2f3ce8b Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
am: 611443e984

Change-Id: I2ead19c8fda255d010aded3884aef0016e1cc74d
2018-04-19 09:43:15 -07:00
Mathew Inwood
d82a743002 StrictMode: fix non-SDK API usage detection.
The warning dedupe logic in the runtime meant that only the first usage of
each API was detected. Disable this logic when DETECT_VM_NON_SDK_API_USAGE
is enabled.

Test: m
Test: $ atest android.os.cts.StrictModeTest#testNonSdkApiUsage
Bug: 78268765
Change-Id: Iba1127b84180b9a5e5eb68abc4691ccad082b80e
2018-04-19 16:18:51 +01:00
Mathew Inwood
9f6bb5b761 Fail gracefully if we get a bad API whitelist.
If we send a bad API whitelist to the Zygote, it causes it to close the
socket. If we take no further action in AMS, it results in the same list
of exceptions being sent when we re-open the socket, resulting in it again
being closed. This results in no longer fork/start any new processes.
Since the list is persisted, this would result in the device entering a
boot loop upon reboot. Since no apps could be started, we cannot recover.

So in the case that the exemptions list causes problems, clear out the
list so we don't try to send it again next time. This means we will see
a single failure, but future attempts will succeed (obviously without
any whitelist). The device should not enter a boot loop.

Note, the test below relies on the fact that we can send at most 1024
arguments in a command to the Zygote (MAX_ZYGOTE_ARGC), and that each
item on the list is a separate argument.

Test: adb shell settings put global hidden_api_blacklist_exemptions \
Test:    $(for i in {1..1025}; do echo -n $i,; done)
Bug: 64382372
Change-Id: Ie47095d516c247ff6a8d667a2ac9b7be45f1acda
2018-04-19 10:12:28 +01:00
Tim Murray
42cac7be22 Merge "ActivityManagerService: add restricted cpuset" into pi-dev
am: a5843ebb59

Change-Id: I1ad95b4e5e4d89efeb0a2836950d7d05cd8cd8d5
2018-04-18 16:59:26 -07:00
Tim Murray
a5843ebb59 Merge "ActivityManagerService: add restricted cpuset" into pi-dev 2018-04-18 23:43:53 +00:00
Chenjie Yu
e0f7fc0a47 Merge "add dump report reason to reports" into pi-dev
am: a194a6bee3

Change-Id: I07a2d92ae166e86afa5bd6600d1217180818b9c3
2018-04-18 13:45:45 -07:00
Chong Zhang
37520f0e06 Adjust media.codec process group upon request from mediaserver
Add method to allow dynamic adjustment of cpuset of media.codec
process. Only accept requests coming from mediaserver.

Bug: 72841545

Change-Id: Idb09d9a5162691503ecf6d811a528d9160326358
2018-04-18 13:23:24 -07:00
Chenjie Yu
e36018b272 add dump report reason to reports
+ also change uidmapping version numbers to int64_t

Bug: 78132855
Change-Id: Iac7ea93e4bf651bd65bd03383e7ab4971af4fc29
Fix: 78132855
Test: gts test
2018-04-18 20:19:21 +00:00
Tim Murray
fef10a47a8 ActivityManagerService: add restricted cpuset
Test: CTS
bug 78197570

Change-Id: I9dd8daba6426b42b7e7e9388dbdac7bd8110b6ca
2018-04-18 09:51:33 -07:00
Mike Ma
90902651b1 Fix screen on count text dump
dischargeScreenOffCount already includes dischargeScreenDozeCount.
Original code deducted dischargeScreenDozeCount twice. This only affects
text dump in bugreport. Proto and checkin dump are not affected.
Test: manual
Fixes: 78187276

Change-Id: Id93465ca75a4a1078e8f280a38b74b696ec62dd2
2018-04-17 21:12:56 +00:00
Dan Gittik
17ad53b40b Merge "Fixed power manager CTS test." into pi-dev
am: 15d35c1274

Change-Id: I375d0d77520a707cc76064a93def15faa5f8ddb1
2018-04-17 03:50:58 -07:00
TreeHugger Robot
15d35c1274 Merge "Fixed power manager CTS test." into pi-dev 2018-04-17 10:39:30 +00:00
Jeff Sharkey
7b913d70b9 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am: 936c0868f8

Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
2018-04-16 17:44:58 -07:00
Jeff Sharkey
936c0868f8 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev 2018-04-17 00:04:53 +00:00
David Chen
5cc0e05e03 Merge "Adds a code when statsd sends intent to getData." into pi-dev
am: 17d2de09cb

Change-Id: I4f429329603d7dfe512de6802d4f083d230fc4d1
2018-04-16 16:21:23 -07:00