Commit Graph

18144 Commits

Author SHA1 Message Date
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
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
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
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
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
Vinit Nayak
bedb9f33c2 Pass displayId to onActivityRotation()
Bug: 154580671
Change-Id: I220e1e9ac1a381c6ebadc3849a393225d1f53e3e
2020-06-04 17:15:32 -07:00
Steve Elliott
3d360da16d Fix missing icon for one-to-one convos
Fixes: 158089612
Test: manual
Change-Id: If588073ff1df557b755b844277e893e001822d79
2020-06-04 11:11:11 -04:00
Riddle Hsu
cd414bdfb0 Merge "Override application display adjustments while launching activity" into rvc-dev am: 1421b3dace
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716091

Change-Id: I81195b7c5e33160659704d7b7dcf27c203ce7f4c
2020-06-04 06:29:08 +00:00
Riddle Hsu
1421b3dace Merge "Override application display adjustments while launching activity" into rvc-dev 2020-06-04 06:20:45 +00:00
Vinit Nayak
741f304314 Merge "Add new callback for when activity rotates" into rvc-dev am: 38dbc97939
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11396809

Change-Id: Id730f3eccc34843dd006b277bab67e1790f0f04b
2020-06-04 04:33:04 +00:00
Vinit Nayak
38dbc97939 Merge "Add new callback for when activity rotates" into rvc-dev 2020-06-04 04:21:10 +00:00
Peiyong Lin
760338ed90 Merge "Allow to load implicit layer from /vendor/app." into rvc-dev am: 1371b76afd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11688191

Change-Id: I34257bdfd340334bcdfc19a3f6a9c5d9aeebe842
2020-06-04 00:53:47 +00:00
Ryan Mitchell
a74111f81c Use a ReferenceQueue to prune weak references
Currently ResourcesManager iterates over all of its weak references to
Resources objects and calls Reference#get to determine if the object
has been garbage collected. This method of pruning WeakReferences
causes reference locks to be acquired in the native layer and causes
lock contention when "references are being processed" by the garbage
collector.

This change uses a ReferenceQueue to determine if a reference has been
garbage collected which should improve performance of
ResourcesManager#getResources when the system is under memory pressure.

By only removing garbage collected references when creating new
Resources objects, the lists grow larger and are periodically pruned
rather than attempting to prune entries from the list every getResources
invocation.

Bug: 157575833
Test: used debugger to observe pruning happening correctly
hange-Id: I3277e80edfa441d24de165e738d33c4fac6b4121
Change-Id: I3277e80edfa441d24de165e738d33c4fac6b4121
2020-06-04 00:47:35 +00:00
Peiyong Lin
1371b76afd Merge "Allow to load implicit layer from /vendor/app." into rvc-dev 2020-06-04 00:40:15 +00:00
Peiyong Lin
eb1c5a4c28 Allow to load implicit layer from /vendor/app.
Currently when loading implicit layers from apks, NativeLoaderNamespace
doesn't allow to dlopen the binaries if they come from apks from
/vendor/app. Implicit layers ship within /vendor/app should work like
other implicit layers. This patch extracts the construction of library
paths of the implicit layers and includes those paths when
NativeLoaderNamespace is created as the part of the permitted library
paths.

Bug: b/157832445
Test: atest android.gputools.cts.CtsRootlessGpuDebugHostTest
Test: setup debug layer and use adb logcat to check vulkan loader output
Change-Id: Ie2ca989bcab890578b5aa540d07f2aee2a0182bd
2020-06-03 21:30:08 +00:00
Liz Kammer
f0cc376617 Use permissionController name rather than hardcode
soong renames the package name in the resource table, so it no longer
needs to be accessed based on the base package name.

Test: forrest
Bug: 147434671
Change-Id: I5b5b6699f720ad8798d36467e88c8d8ddb52c9ee
2020-06-03 20:28:06 +00:00
Vinit Nayak
66bf45ffa8 Add new callback for when activity rotates
Launcher needs to distinguish display changes
that result naturally vs apps that launch
in a fixed portrait/landscape rotation during
the quickstep gesture.This callback helps anticipate
if a subseqent onDisplayChanged() will
have resulted from a natural rotation or not.

Bug: 154580671
Change-Id: I59ee7985a9f367e8fc5826c08476c1a25d1426b0
2020-06-03 10:55:42 -07:00
Riddle Hsu
a474039bdc Override application display adjustments while launching activity
A launching activity with fixed rotation may get information from
a Display object which is associated with application resources.
In order to let the display size and rotation are consistent with
the activity configuration, the override configuration of activity
will update to the display adjustments of application resources.

Fixes: 157558894
Test: AppConfigurationTests#testRotatedInfoWithFixedRotationTransform

Change-Id: I7f72d838170a5f588bb8dd279ae081d1a3ddba95
2020-06-03 22:34:01 +08:00
Steve Elliott
841ddf9dd2 Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11662920

Change-Id: I4a8979618900abb1e13547d67e6fe2539203b3e8
2020-06-02 18:53:14 +00:00
Steve Elliott
cc1937581a Merge "Always use Shortcut Icon in conversation if available" into rvc-dev 2020-06-02 18:46:38 +00:00
Evan Severson
0344d9526e Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11678252

Change-Id: I651672e8d5874f45087bf5605add3b758766d685
2020-06-02 18:41:30 +00:00
Evan Severson
1fe28b24c0 Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev 2020-06-02 18:39:00 +00:00
Zimuzo Ezeozue
2d19d79a2a Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am: efbc3f2d5e
Original change: undetermined

Change-Id: I7ac36ce2c14f1ebfb0b6ccf3e6a054b4d7a7b372
2020-06-02 10:50:34 +00:00
Zimuzo Ezeozue
efbc3f2d5e Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev 2020-06-02 10:45:33 +00:00
Zim
c7496a3a62 Support apps sharing file:// URIs with the camera API
The camera API, MediaStore.ACTION_IMAGE_CAPTURE requires apps to pass
a content:// URI with write permissions to the camera. Unfortunately,
apps haven't been doing this and we only started hitting problems in R
for two reasons:
1. The FileUriExposedException that should crash apps when they try to
share file:// URIs acroos binder is skipped. This is because, the
image_capture intent is passed across binder as a field in a
ChooserActivity Intent and the child intents are not checked for
file URI exposed
2. Prior to R, when camera gets a file:// URI, camera issues a file
open(2) in its process. This open(2) succeeds because the camera had
write_external_storage permission which gave it write access to all
files on external storage

Now, camera targets R and (2) fails because camera does not have write
access to files owned by other apps. To workaround, we do the
following in the apps process when it targets < R:
a. When we detect a file:// URI for the camera in an Intent, we create
the file on disk if it is not already created.
b. Scan the file to insert it in the database and retrieve a
content:// URI
c. Replace the file:// URI with the content URI in the image_capture
intent

This works because, the system will ensure the camera is granted write
access to the content URI.

Test: Manual
Bug: 156336269
Change-Id: I4849ff5e806a8207650ff7534846c36ecdc6d3c0
2020-06-01 20:33:52 +01:00
Evan Severson
eb1e329207 Remove stopship for permissioncontroller pkg name
The change to use the overridden package name in the resources table
won't be included in the current release.

Test: Compile
Bug: 147434671
Change-Id: I9acbf921814088dfaba485d9acc845da650caf87
2020-06-01 12:19:31 -07:00
Julia Reynolds
28bbd2256b Merge "Add method for Settings" into rvc-dev am: 829ac140f8
Change-Id: I7ca30e8641733595a050c3fe4056f45d43c0d60e
2020-05-31 19:08:24 +00:00
Julia Reynolds
829ac140f8 Merge "Add method for Settings" into rvc-dev 2020-05-31 18:57:41 +00:00
Charles Chen
e50d17bf16 Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567
Change-Id: I814dcfd418f6b7bac9396d539cfef9ed7fee809f
2020-05-30 06:51:40 +00:00
Charles Chen
13e3568567 Merge "Fix get display from display context derived context not working" into rvc-dev 2020-05-30 06:35:35 +00:00
Charles Chen
e22c4cb3c6 Fix get display from display context derived context not working
In ContextImpl, we checked the flag "mIsAssociatedWithDisplay" to
identify if a context can access a display or not. The flag wasn't
passed from outer context, and it leads to an issue that context
which created from #createConfigurationContext from display context
failed to obtain display instance.

This CL passes mIsAssociatedWithDisplay from outer context and
also add test to verify the behavior.

fixes: 157719118
Test: atest ContextTest ContextAccessTest

Change-Id: Ibeb2a08c75f90304e12dcf99293c84409c5eea34
2020-05-30 12:46:59 +08:00
Philip P. Moltmann
677df219aa Make it clear that checking shouldShowPermissionRationale is recommended
Bug: 157779069
Test: Docs change only
Change-Id: I288cb852f94ff2e59ede843946d6bee898f0c643
2020-05-30 01:10:23 +00:00
Steve Elliott
6373829000 Always use Shortcut Icon in conversation if available
Bug: 153751740
Test: manual
Change-Id: Ib1002b53d700d2857f69cd476de79a4e34f90559
2020-05-29 15:56:00 -04:00
Julia Reynolds
0c45c6e8ff Add method for Settings
Test: manual
Bug: 156033178
Change-Id: I3c334c6697e9bc13451faa0c0df1cdbdc3eaf6ea
2020-05-29 19:37:56 +00:00
TreeHugger Robot
f7bb82a829 Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510
Change-Id: I747167bf3e361bf0a8ac6f547b66babaf4398350
2020-05-29 04:48:34 +00:00
TreeHugger Robot
9aa8852510 Merge "Fix transition return issues when more than 1 level depth" into rvc-dev 2020-05-29 04:32:46 +00:00