Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
489,161 Commits 3 Branches 0 Tags
6732f25854fcecf6bf973527d08fe8902afb7568
Commit Graph

106109 Commits

Author SHA1 Message Date
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
TreeHugger Robot
918942f462 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev 2020-06-08 19:28:31 +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
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
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
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
Vinit Nayak
2983b70983 Merge "Pass displayId to onActivityRotation()" into rvc-dev 2020-06-05 18:58:32 +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
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
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
Ricky Wai
e986bc4cad Apply app data isolation on isolated or app zygote processes 
Fix: 158088415
Test: atest AppDataIsolationTests
Change-Id: Ic55464397039645938822ac20eb12e375bbe4a72
 2020-06-05 11:50:50 +01:00
shawnlin
ba532aff3e Add a @hide ctr to disable background layer in ActivityView & SurfaceView 
Bug: 152441717
Test: 1. Open bubble
      2. adb shell dumpsys SurfaceFlinger
      3. Check result
Change-Id: I3bda67bb56781eb75b51dc51f491a97efac7b4ef
 2020-06-05 16:08:37 +08:00
Treehugger Robot
5f6705f0e4 Update javadoc to use complete sentence 
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Merged-In: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460
 2020-06-05 04:50:14 +00:00
Automerger Merge Worker
1772e0bee4 Merge changes from topic "am-b75f7374546b417da72660e8f4bd16ae" into rvc-dev-plus-aosp 
* changes:
  Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8ff
  Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761
 2020-06-05 03:36:58 +00:00
TreeHugger Robot
224ce04e42 Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a761 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11473225

Change-Id: I5277cd97e46659df8c0398371f86c9880efca9ef
 2020-06-05 03:36:49 +00:00
Treehugger Robot
e33d6e932a Merge "Update javadoc to use complete sentence" am: 0be3cacedf am: ea9f9d821e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I357ae71b7f86ed3560333a67a2444eb8bb93c71c
 2020-06-05 03:36:44 +00:00
TreeHugger Robot
d5fb11a761 Merge "Get the instance count as the initial value" into rvc-dev 2020-06-05 03:34:32 +00:00
Treehugger Robot
ea9f9d821e Merge "Update javadoc to use complete sentence" am: 0be3cacedf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I6c8358c81bbc7a08802ef027fcd32adea4821ba0
 2020-06-05 03:17:00 +00:00
Treehugger Robot
0be3cacedf Merge "Update javadoc to use complete sentence" 2020-06-05 03:02:36 +00:00
Amy Zhang
023916bd8a Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: If1355f8fceabcccabaf0dc9abe299112123a40b1
 2020-06-05 02:56:27 +00:00
Charles Chen
05a5bfea80 Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700778

Change-Id: I470fdde6e1ea5705ecd7ea00f2b8e45230349a93
 2020-06-05 02:56:00 +00:00
Amy Zhang
a7dc4defd3 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev 2020-06-05 02:49:54 +00:00
Charles Chen
f3a7bc8e31 Merge "Make InputMethodService be an UI context" into rvc-dev 2020-06-05 02:40:17 +00:00
Charles Chen
2924e1eff0 Merge "Add an incorrect context violation on GestureDetector" into rvc-dev am: f843a85226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593841

Change-Id: I0401ac40a7d2a51f3493a3029de2e2ab293509bb
 2020-06-05 02:21:14 +00:00
Charles Chen
f843a85226 Merge "Add an incorrect context violation on GestureDetector" into rvc-dev 2020-06-05 02:08:48 +00:00
Shuzhen Wang
db97350aa1 Camera: Fix race for onCaptureBufferLost callback 
The callback holder was removed when the capture sequence is
completed, which is too soon because the buffer loss callback could
potentially arrives later than the capture sequence completion.

Defer the deletion of the callback holder to when the native inflight
request is removed, which takes into consideration of error
notifications.

Test: Camera CTS
Bug: 155353799
Change-Id: I12b716acc9fbaa9791f0498ac77d4470a7448d5a
 2020-06-04 18:28:44 -07:00
Chiachang Wang
5422d57f59 Merge "Update extra info before registering" am: 49d2af3662 am: cb4ec42283 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35
 2020-06-05 00:41:42 +00:00
Chiachang Wang
cb4ec42283 Merge "Update extra info before registering" am: 49d2af3662 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I6eb786edfe615574c731097df09ae3142e137999
 2020-06-05 00:24:09 +00:00
Vinit Nayak
bedb9f33c2 Pass displayId to onActivityRotation() 
Bug: 154580671
Change-Id: I220e1e9ac1a381c6ebadc3849a393225d1f53e3e
 2020-06-04 17:15:32 -07:00