Mike Ma
604706d12d
Merge "Fix screen on count text dump" into pi-dev am: dd61c7e8e7
...
am: 7351e73b96
Change-Id: Ia2c306193de81a311950e1770a9b0d0e865ac8f7
2018-04-19 13:40:02 -07:00
Evan Rosky
83976c5fa4
Merge "Don't crash during layout of non-attached but focused view" into pi-dev am: 62bb0802f9
...
am: 48cca289df
Change-Id: Iea6f1656939f3630cee634d0054167204faf6829
2018-04-19 13:32:57 -07: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
Evan Rosky
48cca289df
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
...
am: 62bb0802f9
Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465
2018-04-19 13:24:41 -07:00
TreeHugger Robot
dd61c7e8e7
Merge "Fix screen on count text dump" into pi-dev
2018-04-19 20:16:28 +00:00
TreeHugger Robot
62bb0802f9
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
2018-04-19 20:13:32 +00:00
Chong Zhang
5d5eba17c9
Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev am: 3f8884829f
...
am: cadb0d5ec8
Change-Id: Ic9139ac30319d0dd2afb88a44b3fea81dd4b263d
2018-04-19 11:33:32 -07: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
Makoto Onuki
c5e8e23e57
Merge "SyncManager: Dump per-source last sync time too." into pi-dev am: d329ae8010
...
am: 5bb2f9b14d
Change-Id: I0a7c222e33cf8ff95ab8834c4ec31c7a69e0e605
2018-04-19 11:09:57 -07:00
Makoto Onuki
c52be80cb7
Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev am: dbdf5df96e
...
am: c7ed7f0074
Change-Id: I84fd648bf5b47690ab0082516a99c4bbd7be1914
2018-04-19 11:00:05 -07:00
Makoto Onuki
5bb2f9b14d
Merge "SyncManager: Dump per-source last sync time too." into pi-dev
...
am: d329ae8010
Change-Id: Ib57bb1dd5433de157d38c86d8054b7821bf05d54
2018-04-19 10:53:38 -07:00
Makoto Onuki
c7ed7f0074
Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev
...
am: dbdf5df96e
Change-Id: I74e57f9cd0fc051f4308df48535f3dce22f3908b
2018-04-19 10:46:50 -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
Makoto Onuki
d329ae8010
Merge "SyncManager: Dump per-source last sync time too." into pi-dev
2018-04-19 17:37:45 +00:00
Makoto Onuki
dbdf5df96e
Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev
2018-04-19 17:21:48 +00:00
Mathew Inwood
f7cdcb98c2
Merge "Fail gracefully if we get a bad API whitelist." into pi-dev am: 611443e984
...
am: 96b2f3ce8b
Change-Id: I2e4fc91b53606f701682e4fad0bb17616cb58d7e
2018-04-19 10:12:17 -07:00
Beverly Tai
2fe0e01fbf
Merge "Don't mute ringer if apps can bypass dnd" into pi-dev am: 39997ea603
...
am: e4a5044b0f
Change-Id: I45a645c8650211d8cb5016e97762f5a9c48e3cc0
2018-04-19 10:02:33 -07: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
Beverly Tai
e4a5044b0f
Merge "Don't mute ringer if apps can bypass dnd" into pi-dev
...
am: 39997ea603
Change-Id: Ie8bb9617d8439fdcf739f9fe5264aaa5d0421d72
2018-04-19 09:29:53 -07:00
Mathew Inwood
611443e984
Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
2018-04-19 16:24:31 +00:00
Beverly Tai
39997ea603
Merge "Don't mute ringer if apps can bypass dnd" into pi-dev
2018-04-19 16:08:28 +00:00
Jeff Sharkey
275a9e16cc
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev am: 1cd96854d4
...
am: 993106c06a
Change-Id: I67502e0c9acbf942bf2dbb799f60ba406df4f84b
2018-04-19 08:18:50 -07:00
Jeff Sharkey
993106c06a
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
...
am: 1cd96854d4
Change-Id: Ie979847bd41777cef2b4169cb7f78abe174d054d
2018-04-19 08:09:24 -07:00
Jeff Sharkey
1cd96854d4
Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
2018-04-19 14:58:02 +00: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
Jeff Sharkey
23b3118f28
Visit Uris in RemoteViews for granting purposes.
...
RemoteViews end up passing around Uris, so we need to extend Uri
permission grants for them to ensure the recipient of a Notification
object is able to render its contents.
Bug: 9069730
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Change-Id: Id31b5adaf2ee66113a1b503e32126aeddbf97b28
2018-04-18 21:40:47 -06:00
Suprabh Shukla
7f7c493ac0
Merge "Added more documentation for dialogMessage" into pi-dev am: 4d5d3a0254
...
am: 74ef44e6eb
Change-Id: If381c630587490361af78b6e95d29fc33ad224f8
2018-04-18 17:52:32 -07:00
Suprabh Shukla
74ef44e6eb
Merge "Added more documentation for dialogMessage" into pi-dev
...
am: 4d5d3a0254
Change-Id: I241ddd624eb4409eacde7a3224dc27fa80d5de10
2018-04-18 17:42:13 -07:00
TreeHugger Robot
4d5d3a0254
Merge "Added more documentation for dialogMessage" into pi-dev
2018-04-19 00:13:13 +00:00
Tim Murray
75389eb0f4
Merge "ActivityManagerService: add restricted cpuset" into pi-dev am: a5843ebb59
...
am: 42cac7be22
Change-Id: I44a3ea55552ef41cbc6b3b367881f6e7d76268c0
2018-04-18 17:12:09 -07:00
Jason Monk
e69926143b
Merge "Make Instrumentation more robust to other inputs" into pi-dev am: 3071522227
...
am: d1a9320e98
Change-Id: Iada00b0e18f978f8fc85a74fa45ccd21cbeb20ef
2018-04-18 17:06:40 -07: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
Jason Monk
d1a9320e98
Merge "Make Instrumentation more robust to other inputs" into pi-dev
...
am: 3071522227
Change-Id: Ifc3e5c1959a3b25025f396fbfc91363580b239ad
2018-04-18 16:54:05 -07:00
Tim Murray
a5843ebb59
Merge "ActivityManagerService: add restricted cpuset" into pi-dev
2018-04-18 23:43:53 +00:00
TreeHugger Robot
3071522227
Merge "Make Instrumentation more robust to other inputs" into pi-dev
2018-04-18 23:43:15 +00:00
Suprabh Shukla
3e03ab9312
Added more documentation for dialogMessage
...
Added explanation that callers can use a format string which takes a
single argument which is the name of the suspended app that the user
tried to launch.
Test: make docs
Bug: 77507744
Change-Id: I0a5259048332030385265ceab9c7d76766abac7d
2018-04-18 16:01:29 -07:00
Evan Rosky
d58b65cd31
Don't crash during layout of non-attached but focused view
...
Verifies that there is a viewrootimpl before calling its
methods.
Bug: 77193567
Test: N/A
Change-Id: I301c3aede3d0f7e1d2abf6fe5bb3d852f697577b
2018-04-18 15:34:29 -07:00
TreeHugger Robot
cb9a54684b
Merge "Enable Notifications on AndroidTV"
2018-04-18 22:19:49 +00:00
Chenjie Yu
b62e20c7f9
Merge "add dump report reason to reports" into pi-dev am: a194a6bee3
...
am: e0f7fc0a47
Change-Id: I4b97af127a219ded41891d90d44dd5940b7dd0af
2018-04-18 14:35:25 -07: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
TreeHugger Robot
a194a6bee3
Merge "add dump report reason to reports" into pi-dev
2018-04-18 20:35:29 +00: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
Rob Carr
cf68264741
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev am: 3ef2d6d9d8
...
am: 871d0c0759
Change-Id: I5332781f690fed2353910cc2e993f8d4708d6c73
2018-04-18 13:05:53 -07:00
Jason Monk
e96443e5a7
Make Instrumentation more robust to other inputs
...
Test: atest cts/tests/app/src/android/app/cts/InstrumentationTest.java
Change-Id: I2d55274ab19c4687ce85c086f2da61a4316b8096
Fixes: 70720100
2018-04-18 15:43:50 -04:00
Rob Carr
871d0c0759
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
...
am: 3ef2d6d9d8
Change-Id: I6c14d19d72d03d975e6b1e34b00fc9ac879e4811
2018-04-18 12:27:38 -07:00
Dan Cashman
9fa0a7788f
Merge "Add AccountManager key rotation awareness." into pi-dev am: 3091d60a70
...
am: a8992ecf37
Change-Id: I3ba929f0732a34a7f2694c96cec9fcb03b453838
2018-04-18 12:18:06 -07:00
Yu-Han Yang
126b83de9c
Merge "Add setting for GNSS location request update duration" into pi-dev am: af52d9815a
...
am: 53bab450b9
Change-Id: I47c8ff74e6297a8a78d9710614353bbf29542120
2018-04-18 12:04:16 -07:00
Rob Carr
3ef2d6d9d8
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
2018-04-18 18:59:43 +00:00
Dan Cashman
a8992ecf37
Merge "Add AccountManager key rotation awareness." into pi-dev
...
am: 3091d60a70
Change-Id: Ife05dbf2b6e138ef928e597d42c99a12997e7b74
2018-04-18 11:35:58 -07:00