Commit Graph

14347 Commits

Author SHA1 Message Date
TreeHugger Robot
5cc6aae63b Merge "Product partition must have limited system configs." 2020-06-08 04:17:33 +00:00
Steve Elliott
cb1af1e0be Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d am: 1557f3e094 am: 454e0f2108
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: Ied6eaf76018356f682c495c96ef1b279a927e463
2020-06-06 16:09:01 +00:00
Svetoslav Ganov
f74f28160d Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666 am: deb797776a am: 2191f1c2e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: I4405ec52394c0093d0f37da512e5a2fd827a4e1b
2020-06-06 15:49:46 +00:00
Steve Elliott
1557f3e094 Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185

Change-Id: Ic3f5aba0428e22e1124b2f7f1cc76b803e7202dd
2020-06-06 15:41:43 +00:00
Svetoslav Ganov
deb797776a Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376

Change-Id: Iba05ad9051487dfe285997e97b5075579602a88d
2020-06-06 15:21:45 +00:00
Steve Elliott
05e10b59af Merge "Fix missing icon for one-to-one convos" into rvc-dev 2020-06-06 15:12:04 +00:00
Svetoslav Ganov
0ce4fba38f Merge "Correctly offset app op history on reboot" into rvc-dev 2020-06-06 14:50:03 +00:00
Jing Ji
79bb2eec20 Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9 am: a281c93ab1 am: 701dddc99a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049

Change-Id: I9fe283219945a9b75da4a68e29623b911b8fdd0f
2020-06-05 23:47:47 +00:00
Jing Ji
701dddc99a Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9 am: a281c93ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049

Change-Id: I01d5a7ae0da8859686105e83bce88e81150138b3
2020-06-05 23:33:25 +00:00
Jing Ji
8013aa3041 Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049

Change-Id: Ia4ed833e1f0627f68a138b100acbc4b185ba24f1
2020-06-05 23:20:58 +00:00
Jing Ji
d29532e699 Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev 2020-06-05 23:16:36 +00:00
Mike Digman
db5a5c8e1b Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01 am: b965c06dc9 am: f076a8d745
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866

Change-Id: I991562738bccc2375a3e5648299e0aefa9d78a6e
2020-06-05 20:02:52 +00:00
Miranda Kephart
769ccfd7b5 Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621 am: ec217d20d0 am: 729073e183
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868

Change-Id: I515b6382afc49993f3c200b348402dce9395f25f
2020-06-05 19:56:47 +00:00
Mike Digman
f076a8d745 Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01 am: b965c06dc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866

Change-Id: I36ead9a3deac1ecd951c49da9ac28dbdb0ece507
2020-06-05 19:48:45 +00:00
Miranda Kephart
729073e183 Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621 am: ec217d20d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868

Change-Id: I8c2199f4312d1f07dcc1997deb927a2ad992a23d
2020-06-05 19:46:29 +00:00
Mike Digman
3e7995dfb0 Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866

Change-Id: I99a6ed7dd8d3979fab4e9a7f3465041f972e5eca
2020-06-05 19:30:24 +00:00
Miranda Kephart
166b9e0450 Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868

Change-Id: I35d492f5dd522ff7eafeea8d5c984e4a19e69455
2020-06-05 19:28:05 +00:00
Mike Digman
5aa8394608 Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev 2020-06-05 19:19:41 +00:00
Miranda Kephart
3a51a85aaf Merge "Only show error if screenshot process dies within timeout period" into rvc-dev 2020-06-05 18:55:08 +00:00
TreeHugger Robot
1968736265 Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165 am: a19bea8b0a am: 967113ba8e am: f5d92a43b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755478

Change-Id: Ie97fcdaa30f58469673d8f315dfebea80f86d0e6
2020-06-05 18:32:20 +00:00
Automerger Merge Worker
65bc35b9da Merge "Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev am: c9f8b52b26 am: d2ac978388 am: e1a1d01b4e" into rvc-qpr-dev-plus-aosp am: a556847bde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716081

Change-Id: I4de543483de79358ecaa4b8a0da9f43ba800eed9
2020-06-05 18:14:57 +00:00
TreeHugger Robot
73f9914b28 Merge "Add test for tapping Work share tab when work profile is off" into rvc-dev am: 8f27cd8e55 am: 8159948707 am: 96bd68b04b am: 7f7325a070
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734120

Change-Id: I6d02f2f94e0366d7b157ef84d453d9f5420b1938
2020-06-05 18:14:26 +00:00
Antoan Angelov
fc61877728 Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c63b am: 8b60025767 am: 1e6c00c862 am: 286bfd4e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734105

Change-Id: Ice58dd460f1d67058d26e0baa228ba2fc7844b73
2020-06-05 18:12:05 +00:00
Felipe Leme
49e0ea7d72 Merge "Added command / binder method to temporarily disable VoiceInteraction." into rvc-dev am: df98b27008 am: 898e01c95b am: 6f6a25d347 am: ca8d227f31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625271

Change-Id: Icb667ac6d86c22b8b850d4433d02e90601bc811d
2020-06-05 18:06:37 +00:00
Mike Digman
ad2e9a0a57 Make Sharesheet group and pin menu match material, redlines
Requires wholesale creation of dialog layout. Using a fixed
width approach.

Test: manual
Bug: 152978014
Fixes: 158023059
Change-Id: Ifcff21b2f999839c3eba601a2ee96a08677e1267
2020-06-05 10:18:43 -07:00
Svet Ganov
185ddf644b Correctly offset app op history on reboot
The offset was computed based off the offset represented by
the most recent historical file while we have to use the time
this file was written.

Also now we persist the history on reboot and shutdown,
significantly minimizing the possibility of data loss.

Added test API to emulate reboot of the history to allow for
precise and tightly controlled test to prevent flakes due to
boot time deviations.

Test: atest android.app.appops.cts.HistoricalAppopsTest#testRebootHistory

Fixes:156853195

Change-Id: I4142371f8bc2b1d710cc8c300e7e79cb03764c04
2020-06-05 09:55:27 -07:00
TreeHugger Robot
f5d92a43b3 Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165 am: a19bea8b0a am: 967113ba8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755478

Change-Id: I264f6a85627d9d0902d51db030a3869bf42289e6
2020-06-05 16:44:52 +00:00
TreeHugger Robot
0411d1d7e3 Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755478

Change-Id: Ieef9c07316a249d2336d2f9e3440e6e429022037
2020-06-05 16:10:29 +00:00
TreeHugger Robot
6d410d8165 Merge "Cleanup outdated TODOs" into rvc-dev 2020-06-05 15:53:50 +00:00
arangelov
a2a821336f Cleanup outdated TODOs
Fixes: 158292009
Test: compiled
Change-Id: I7889c7ee818c154194bbe66eabbe04aa7ddb65a4
2020-06-05 15:27:43 +01:00
PETER LIANG
e1a1d01b4e Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev am: c9f8b52b26 am: d2ac978388
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716081

Change-Id: I54f53c27e8fc8ab2591e548c5fe2d24b7ef365bf
2020-06-05 12:48:13 +00:00
TreeHugger Robot
96bd68b04b Merge "Add test for tapping Work share tab when work profile is off" into rvc-dev am: 8f27cd8e55 am: 8159948707
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734120

Change-Id: If5665760401ae74f7521e34fffadbe4a24874c92
2020-06-05 12:48:04 +00:00
PETER LIANG
37746ba287 Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev am: c9f8b52b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716081

Change-Id: Iff43cb6194874cb2ee333bc460cbc13963ea8a06
2020-06-05 12:41:13 +00:00
PETER LIANG
c9f8b52b26 Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev 2020-06-05 12:36:06 +00:00
TreeHugger Robot
552252d2b9 Merge "Add test for tapping Work share tab when work profile is off" into rvc-dev am: 8f27cd8e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734120

Change-Id: I8054bf473b2b229034391461e170f611252d01f1
2020-06-05 12:35:01 +00:00
TreeHugger Robot
8f27cd8e55 Merge "Add test for tapping Work share tab when work profile is off" into rvc-dev 2020-06-05 12:23:43 +00:00
Antoan Angelov
1e6c00c862 Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c63b am: 8b60025767
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734105

Change-Id: Ieff61e3c0714545254001464384d75752b632365
2020-06-05 10:49:44 +00:00
Antoan Angelov
e42a9e3117 Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c63b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734105

Change-Id: I2134a003dce577b7c89c8bf10a57300b349adac4
2020-06-05 10:25:16 +00:00
Antoan Angelov
16fce9c63b Merge "Setup button bar padding before empty state handling" into rvc-dev 2020-06-05 10:04:52 +00:00
Felipe Leme
ca8d227f31 Merge "Added command / binder method to temporarily disable VoiceInteraction." into rvc-dev am: df98b27008 am: 898e01c95b am: 6f6a25d347
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625271

Change-Id: I0687440e60258475f4ffacc9e1c1901df96ee78d
2020-06-05 08:02:24 +00:00
Felipe Leme
49c3937465 Merge "Added command / binder method to temporarily disable VoiceInteraction." into rvc-dev am: df98b27008
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625271

Change-Id: I662c80981340e0552883e69bbca3d46cd8f15f5b
2020-06-05 07:27:23 +00:00
Felipe Leme
df98b27008 Merge "Added command / binder method to temporarily disable VoiceInteraction." into rvc-dev 2020-06-05 07:11:40 +00:00
felipeal
755578ac28 Added command / binder method to temporarily disable VoiceInteraction.
It will be used by Automotive when the display is off.

Test: adb shell cmd voiceinteraction disable true && \
      adb shell cmd voiceinteraction show
Test: atest CtsVoiceInteractionTestCases CtsAssistTestCases
Bug: 154011437

Change-Id: Ia87b0544b242c356c4f9180e250e2df54279803f
2020-06-04 23:05:14 +00:00
TreeHugger Robot
d766e7b024 Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev am: d1fee56540 am: bac94e3998 am: 4810cdb9b6 am: d721e31750
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733623

Change-Id: I7b85e60ff7104a694f5576dd9f9c2bc3b8719c97
2020-06-04 22:45:33 +00:00
Jing Ji
1cd1f607e9 Use the UID as the package name in procstat assoc proto dump
And try to compress the process name if possible

Bug: 155980964
Test: Manual
Change-Id: I689724e7c271ba8d85608c3f484250e13c1a1c92
2020-06-04 15:44:26 -07:00
TreeHugger Robot
d721e31750 Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev am: d1fee56540 am: bac94e3998 am: 4810cdb9b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733623

Change-Id: If20f2f4df3b1d4daf06addc579e289cb121289ea
2020-06-04 22:29:49 +00:00
TreeHugger Robot
29deaea2ce Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev am: d1fee56540
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733623

Change-Id: Ic4ab9abc78cc8740088efb292932d5d8d17d74b0
2020-06-04 22:00:53 +00:00
TreeHugger Robot
d1fee56540 Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev 2020-06-04 21:37:39 +00:00
Miranda Kephart
700a093b0c Only show error if screenshot process dies within timeout period
Currently, we show a "Couldn't take screenshot" error any time the
screenshot process disconnects. However, if the screenshot process
remains up, this can result in strange superfluous notifications,
where hours later the screenshot process gets frozen/killed due to
memory pressure, and we show the notification despite the user not
trying to take a screenshot at that point.

This change adds a check so that we only show the error notification
if the screenshot process is disconnected within the timeout period
(10 seconds).

Bug: 156064134
Fix: 156064134
Test: manual -- killed the process with 'adb shell ps | grep screenshot'
and then 'adb shell kill <pid>' to verify that the error notification
appeared, then made sure it did not appear post-change.

Change-Id: I2419634ad888300abc8b50aadab5888ce653e363
2020-06-04 16:48:49 -04:00
arangelov
f32a43868b Add test for tapping Work share tab when work profile is off
Also fix some work tab-related tests.

Fixes: 158166545
Fixes: 148156663
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I5850bbc7d72d563f6e58dd19fafc56c0703ce669
2020-06-04 19:09:35 +01:00