Nate Myren
3ff65c2dfd
Merge "Revert "Use permissionController name rather than hardcode"" into rvc-dev-plus-aosp
2020-06-08 19:44:36 +00:00
TreeHugger Robot
6732f25854
Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11510012
Change-Id: Idb2078674c06125f282668c7862fdb5d1b791467
2020-06-08 19:41:23 +00:00
Nate Myren
61ab30d2a6
Revert "Use permissionController name rather than hardcode"
...
Revert submission 11618534-rename-resources
Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround
Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129
2020-06-08 19:35:05 +00:00
TreeHugger Robot
918942f462
Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev
2020-06-08 19:28:31 +00:00
Treehugger Robot
b736478a80
Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am: 907124607f am: 5f016c8deb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321018
Change-Id: I376684b31398743e5c873e8ccc874d0c6a1c8c89
2020-06-08 16:19:19 +00:00
TreeHugger Robot
8274d0fba7
Merge "Insets: Fix stuck mPendingFrame" into rvc-dev am: 88e86e641a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744899
Change-Id: I94c27dc579daa9da0a28b9d6603e1ef7c40a1079
2020-06-08 15:42:21 +00:00
TreeHugger Robot
88e86e641a
Merge "Insets: Fix stuck mPendingFrame" into rvc-dev
2020-06-08 15:41:26 +00:00
TreeHugger Robot
dc73a09889
Merge "Apply app data isolation on isolated or app zygote processes" into rvc-dev am: 8434b9fc88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689593
Change-Id: Iee4baeba4580c74275ef54a93260050804a8c9cd
2020-06-08 11:07:57 +00:00
TreeHugger Robot
8434b9fc88
Merge "Apply app data isolation on isolated or app zygote processes" into rvc-dev
2020-06-08 11:03:56 +00:00
Treehugger Robot
907124607f
Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting"
2020-06-08 08:58:05 +00:00
TreeHugger Robot
1f883f9099
Merge "Update javadoc to use complete sentence" into rvc-dev
2020-06-08 08:56:46 +00:00
Shawn Lin
855ecdd0e8
Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a858
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700783
Change-Id: I103f7db216c495c2bfeaa83506eca23923b92e1f
2020-06-08 03:45:53 +00:00
Shawn Lin
c54d84a858
Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev
2020-06-08 03:34:20 +00:00
Philip P. Moltmann
802f5b5005
Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669477
Change-Id: Ieb4c0a463493723fab5f344ae6d80cfaad138e08
2020-06-06 18:19:01 +00:00
Philip P. Moltmann
8083336a88
Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev
2020-06-06 18:10:11 +00:00
Steve Elliott
eec7f12366
Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185
Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf
2020-06-06 15:29:19 +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
2d56a15699
Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376
Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c
2020-06-06 15:06:03 +00:00
Svetoslav Ganov
0ce4fba38f
Merge "Correctly offset app op history on reboot" into rvc-dev
2020-06-06 14:50:03 +00:00
Stanislav Zholnin
5a337a6a9f
Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29dfd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689275
Change-Id: I1805e5b42ddbc311677a7e80de9f5c3bcb8ffccd
2020-06-06 14:30:43 +00:00
Stanislav Zholnin
c784a29dfd
Merge "Keep unforwarded operation for noted ops." into rvc-dev
2020-06-06 14:12:38 +00:00
Stanislav Zholnin
e44f134adb
Keep unforwarded operation for noted ops.
...
Align treatment of noted ops with AsyncNotedOps.
Fixes: 154775996
Test: atest AppOpsLoggingTest#disableCollectedAndNoteSyncOpAndCheckLog
Change-Id: I3dcd8275b6229946875bc184d25b18d2da76d5ba
Merged-In: I3dcd8275b6229946875bc184d25b18d2da76d5ba
2020-06-06 06:45:16 +00:00
Xin Li
d7785982ac
Merge "Merge QQ3A.200605.002 into master"
2020-06-06 01:41:11 +00:00
Jing Ji
d948fca5dd
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049
Change-Id: I0b5ee05a425ae7904eb361e79664800271e52f6d
2020-06-05 23:18:54 +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
Mihai Popa
7bd1fc8b4e
Merge "Remove reduntant variable" am: 5241a207fb am: 202dd72169
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280
Change-Id: Ie8bd86ae505cddb133844c6808b1e9e3cba5e32b
2020-06-05 22:24:14 +00:00
TreeHugger Robot
7b5d5fe082
Merge "Update textclassifier TEST_MAPPING file." into rvc-dev am: 78d74114aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11754101
Change-Id: I2b0eaa02276062be874cb8e55414ac71a489aef6
2020-06-05 22:12:17 +00:00
Mihai Popa
202dd72169
Merge "Remove reduntant variable" am: 5241a207fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280
Change-Id: Ia32ef697dbd37aa3c0988f5abd2c7c2ba598e32f
2020-06-05 22:11:47 +00:00
TreeHugger Robot
78d74114aa
Merge "Update textclassifier TEST_MAPPING file." into rvc-dev
2020-06-05 21:56:34 +00:00
Mihai Popa
5241a207fb
Merge "Remove reduntant variable"
2020-06-05 21:56:01 +00:00
Mike Digman
2fd7f7c3a8
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866
Change-Id: I1e7c5bfc726f11e992df8fc37a5eb703d06e9572
2020-06-05 19:29:02 +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
Vinit Nayak
e5596e83cb
Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b70983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745487
Change-Id: I4ba1088269fec55593541d4a448cb511be5d470a
2020-06-05 19:10:28 +00:00
Miranda Kephart
762b9fb13d
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868
Change-Id: I72b2353a5bfe4961b74776e07f5db33dd3a777ef
2020-06-05 19:09:58 +00:00
Vinit Nayak
2983b70983
Merge "Pass displayId to onActivityRotation()" into rvc-dev
2020-06-05 18:58:32 +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
Ryan Mitchell
ccd12e5eed
Merge "Use a ReferenceQueue to prune weak references" into rvc-dev am: 0053a10ea0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707956
Change-Id: I0cd3e82bcde0625432f853b257d7fd1d0156197e
2020-06-05 18:30:36 +00:00
Ryan Mitchell
0053a10ea0
Merge "Use a ReferenceQueue to prune weak references" into rvc-dev
2020-06-05 18:27:50 +00:00
Joanne Chung
a0adc25387
Update textclassifier TEST_MAPPING file.
...
Add CtsTextClassifierTestCases and TextClassifierServiceTest into
presubmit.
Bug: 154961272
Test: atest --test-mapping frameworks/base/core/java/android/service/textclassifier
Test: atest --test-mapping frameworks/base/core/java/android/view/textclassifier
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/textclassifier
Change-Id: I123eeb0ce11e2b159ebbf20fe81dc682cd347230
2020-06-06 01:49:27 +08: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
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
Liz Kammer
e44a2b2bb8
Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp
2020-06-05 15:16:59 +00:00
Adrian Roos
021f4a7140
Insets: Fix stuck mPendingFrame
...
Fixes an issue where the mPendingFrame was not properly cleared
if we re-applied the current frame.
Fixes: 156762386
Test: InsetsSourceConsumerTest
Change-Id: I9f0ebfafac44e1b4b87ea9d3408e64ba34bca2ec
2020-06-05 17:15:26 +02:00
arangelov
a2a821336f
Cleanup outdated TODOs
...
Fixes: 158292009
Test: compiled
Change-Id: I7889c7ee818c154194bbe66eabbe04aa7ddb65a4
2020-06-05 15:27:43 +01: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