OSDN Git Service
Robert Carr [Tue, 9 Apr 2019 14:42:02 +0000 (07:42 -0700)]
DO NOT MERGE SurfaceControl: Fix captureLayers JNI
Missed a call-point in last refactoring.
This CL should have been included in https://googleplex-android-review.git.corp.google.com/q/topic:%22bp-secure-screen-rotation%22+(status:open%20OR%20status:merged)
Bug:
130211665
Bug:
133054270
Test: Manual
Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb
(cherry picked from commit
bf9298f1c9b848ff0db4ae0be3913ad531bafa9e)
Jonathan Scott [Wed, 22 May 2019 02:51:33 +0000 (19:51 -0700)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am:
4c9fa739ff am:
66785eeba5 -s ours
am:
97d3ab297a -s ours
am skip reason: subject contains skip directive
Change-Id: If1f2b2c41a0d0fd16e2b618a0f01ac7fead3f98b
Jonathan Scott [Wed, 22 May 2019 02:49:22 +0000 (19:49 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am:
3be29d429b am:
c0c0827df5 -s ours
am:
b2c9f618d4 -s ours
am skip reason: subject contains skip directive
Change-Id: Iba24162bbcac29674b247a5c3f5ac7eb571cbea3
Jonathan Scott [Wed, 22 May 2019 00:28:01 +0000 (17:28 -0700)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am:
4c9fa739ff
am:
66785eeba5 -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1
cd6c636800 is in history
Change-Id: Ieb5f34b6aba4d9369be013a399652eac2f8210e0
TreeHugger Robot [Wed, 22 May 2019 00:24:38 +0000 (00:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jonathan Scott [Wed, 22 May 2019 00:22:25 +0000 (17:22 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am:
3be29d429b
am:
c0c0827df5 -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1
cd6c636800 is in history
Change-Id: Ie04bbf63da652c54cf3eac6d6a480d239d165274
Bill Yi [Tue, 21 May 2019 23:30:45 +0000 (16:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9c19824ce68c9c6de0cd4d7d6c4f7fda28a6782a
TreeHugger Robot [Tue, 21 May 2019 21:18:05 +0000 (21:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 21:12:48 +0000 (21:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 21:12:40 +0000 (21:12 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 21:07:17 +0000 (21:07 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jonathan Scott [Tue, 21 May 2019 20:57:03 +0000 (13:57 -0700)]
Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
am:
4c9fa739ff
Change-Id: I300dda26365dab7052b74383a302676f3e99be55
Jonathan Scott [Tue, 21 May 2019 20:55:50 +0000 (13:55 -0700)]
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
am:
3be29d429b
Change-Id: Ia12a64ca1bd24f4070c6413abe1369009aa6c349
TreeHugger Robot [Tue, 21 May 2019 20:54:53 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 20:50:53 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 21 May 2019 20:48:23 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 21 May 2019 19:06:22 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic4b5a5b32412773e03a3cab4084af7955e3b74fe
TreeHugger Robot [Tue, 21 May 2019 18:45:05 +0000 (18:45 +0000)]
Merge "Clean up ProcessRecord when reuse a pid." into pi-dev
TreeHugger Robot [Tue, 21 May 2019 18:32:27 +0000 (18:32 +0000)]
Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
Jonathan Scott [Tue, 21 May 2019 11:10:10 +0000 (04:10 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).
am:
cd6c636800 -s ours
am skip reason: subject contains skip directive
Change-Id: I505c495256607b7379798bd0c2d926dacc48ca66
TreeHugger Robot [Tue, 21 May 2019 09:44:05 +0000 (09:44 +0000)]
Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev
Bill Yi [Tue, 21 May 2019 08:31:41 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ifc4e18087472a27249e2ba14905b6caf7445a795
Bill Yi [Tue, 21 May 2019 07:44:23 +0000 (00:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0a9460a58149d8c0cc6833c52f4cd922ba065d81
Bill Yi [Tue, 21 May 2019 06:58:39 +0000 (23:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic1d1e3cae255f1930d57acf6059ed0d8cadcf4e4
Bill Yi [Tue, 21 May 2019 05:26:44 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I310291e83e8760ad2fc8d8489602d8598d505892
Bill Yi [Tue, 21 May 2019 05:18:14 +0000 (22:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I839b3ed2252bcc2d9c3413961c91324484d36ff7
Bill Yi [Tue, 21 May 2019 04:30:18 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84159849a8367bdc78464d6902b9fbcc69115866
Bill Yi [Tue, 21 May 2019 02:57:11 +0000 (19:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icf5d15017d24d8d3f9353c65a0211da1d8f87cf7
TreeHugger Robot [Mon, 20 May 2019 04:25:27 +0000 (04:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 20 May 2019 01:26:23 +0000 (18:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2b9eb3a2f4543f79debd422951609abfad6b42f3
Bill Yi [Sat, 18 May 2019 05:07:53 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie71c6b1ae7229c5b77a93235ce1e596ce7185f57
Hui Yu [Fri, 17 May 2019 20:39:52 +0000 (13:39 -0700)]
Clean up ProcessRecord when reuse a pid.
When Zygote starts a process with a pid, system_server may have this
pid associate with a old process which is killed by the OS but
system_server has not finished cleanup. In this case, clean up the old
ProcessRecord so the new process can use the pid.
This problem is exposed because the asynchronous process start change.
attachApplicationLocked() may happen before handleProcessStartedLocked() and
the mPidsSelfLocked may still have the old ProcessRecord associate with
the new process's pid.
Bug:
131105245
Test: POC test steps in b/
131105245.
Change-Id: I775acda5147291d0cf9836b6ffb3f52d1bf9bffe
Merged-In: I775acda5147291d0cf9836b6ffb3f52d1bf9bffe
Merged-In: I5d421f6c68f6b3437d51c94f4aef77e08a7bf002
Tyler Gunn [Tue, 14 May 2019 18:08:06 +0000 (11:08 -0700)]
Update API docs for TelecomManager#endCall.
Make it clear that ending an emergency call is not possible with this
method.
Test: Compile; this is a docs change.
Bug:
132438333
Change-Id: I736b90e31723ee2055cedf16142c4d0f494bf49b
Jonathan Scott [Mon, 13 May 2019 12:14:19 +0000 (13:14 +0100)]
[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set.
Test: atest LockTaskControllerTest
Bug:
132593073
Change-Id: I1bfacd5992569d67cdaa526b18d1c426a366babb
Daichi Hirono [Mon, 25 Jun 2018 02:16:41 +0000 (11:16 +0900)]
Stop invoke initAppOps in Camera default constructor.
Camera default constructor does not create the underlying native camera
object. Thus calling _enableShutterSound after the default constuctor
causes application crash.
Bug:
132362603
Bug:
80498247
Test: ARC++ Eve/Kevin:
Manually modify the code to return MODE_IGNORED for
AppOpsService#checkAudioOperation() and to return false for
CameraManager#supportsCamera2ApiLocked. Then start voice call in
Hangouts.
cf_x86_phone with camera HALv1 enabled:
New CTS test
Change-Id: Ia232dd71da15fda31c4dbe5568ba5083cbfaed9b
Merged-In: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
Jonathan Scott [Tue, 7 May 2019 15:54:32 +0000 (16:54 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
Bug:
127605586
Test: Manual
Change-Id: Ifb049d147f9ef30976cdb93d7bf63a761efc1b86
Merged-In: I40c9a29935d9e5a27cdcdf90187efe61035448fd
Jonathan Scott [Thu, 9 May 2019 10:52:47 +0000 (11:52 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).
Bug:
127605586
Test: Manual
Change-Id: I40c9a29935d9e5a27cdcdf90187efe61035448fd
Jonathan Scott [Thu, 9 May 2019 02:51:15 +0000 (19:51 -0700)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev am:
42fb96810e am:
68c54d17e2
am:
ca23d007b4
Change-Id: I442ff747c342f79869aad9a3afbfdac9490e9906
Jonathan Scott [Thu, 9 May 2019 02:40:11 +0000 (19:40 -0700)]
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58 am:
970863ea62 am:
9707affaa8
am:
906080bd27 -s ours
am skip reason: subject contains skip directive
Change-Id: I4faa3f6284b8708d2ece0f96db8ec498bc841299
Jonathan Scott [Thu, 9 May 2019 01:48:36 +0000 (18:48 -0700)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev am:
42fb96810e
am:
68c54d17e2
Change-Id: I315b894df15d7fd3dd1f74fdf323f07633981cd3
Jonathan Scott [Thu, 9 May 2019 01:38:58 +0000 (18:38 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58 am:
970863ea62
am:
9707affaa8
Change-Id: Iba3263f17bb98cbad6239b04d6f3d7667312118a
Jonathan Scott [Thu, 9 May 2019 00:38:02 +0000 (17:38 -0700)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev
am:
42fb96810e
Change-Id: Iae376975d87e030148b258cfeec3ab583b9f68fc
Jonathan Scott [Thu, 9 May 2019 00:34:19 +0000 (17:34 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
am:
970863ea62
Change-Id: I7cb30baeff59cbdfc688c9f44bfdb1c25f20f33a
TreeHugger Robot [Wed, 8 May 2019 23:21:42 +0000 (23:21 +0000)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c
[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
Bryan Ferris [Wed, 8 May 2019 23:04:43 +0000 (23:04 +0000)]
Merge "[RESTRICT AUTOMERGE] Careful with screenshots containing secure layers!" into pi-dev
Steven Moreland [Wed, 8 May 2019 21:57:21 +0000 (14:57 -0700)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev am:
123ffb6202 am:
f489aed3c1
am:
96f4f9e2e9
Change-Id: I25c279ca932b02850bda6bcc58453402369bd8a4
Steven Moreland [Wed, 8 May 2019 21:37:05 +0000 (14:37 -0700)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev am:
123ffb6202
am:
f489aed3c1
Change-Id: Iea1bfc306161b065a3699fd780da28296f46dc96
Steven Moreland [Wed, 8 May 2019 21:20:20 +0000 (14:20 -0700)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev
am:
123ffb6202
Change-Id: I8ecd922f540f9b93edd44056bf375e464c63eb54
TreeHugger Robot [Wed, 8 May 2019 20:49:53 +0000 (20:49 +0000)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev
TreeHugger Robot [Wed, 8 May 2019 20:00:27 +0000 (20:00 +0000)]
Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev
TreeHugger Robot [Wed, 8 May 2019 18:56:19 +0000 (18:56 +0000)]
Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev
Christopher Dombroski [Wed, 8 May 2019 04:12:12 +0000 (21:12 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default am:
43e682abef am:
93780658ba
am:
e2d4ed92b4
Change-Id: I7b440302c64f54d33ec4afce2ac517288cc5cba6
Christopher Dombroski [Wed, 8 May 2019 03:19:24 +0000 (20:19 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default am:
43e682abef
am:
93780658ba
Change-Id: I3755a8c458b92e565d33779d3d4d3c7c6614cdf5
Christopher Dombroski [Wed, 8 May 2019 02:13:32 +0000 (19:13 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default
am:
43e682abef
Change-Id: I13fd6fc7ba432a2cde1e8dbbc7b206e8203374f8
Jonathan Scott [Mon, 29 Apr 2019 17:03:58 +0000 (18:03 +0100)]
[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings.
Fixes:
127605586
Test: atest LockTaskControllerTest
Change-Id: I7d4c53fd6740f500d1a0ce18b47b83ed895300a5
Android Build Merger (Role) [Tue, 7 May 2019 19:42:03 +0000 (19:42 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
Change-Id: Ifdd51a2d215992ffde99f5b5adbac27808d27cbf
Android Build Merger (Role) [Tue, 7 May 2019 19:41:27 +0000 (19:41 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc
Change-Id: I56ea274e6a04f25a4556a675fc5896cb27271499
Android Build Merger (Role) [Tue, 7 May 2019 19:40:52 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c
Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479
Android Build Merger (Role) [Tue, 7 May 2019 19:40:17 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518
Change-Id: I6a2f5b46c70720cedf377f107b77d590b297aea4
Android Build Merger (Role) [Tue, 7 May 2019 19:39:38 +0000 (19:39 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c
Change-Id: I29e8b905ef0450d9bd7a7fcd82411cffa84394d4
Jonathan Scott [Tue, 7 May 2019 15:27:17 +0000 (16:27 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
Bug:
127605586
Test: Manual
Change-Id: I5b5b0f9184220a4ed3080ca27792f66d1f5d41aa
Robert Carr [Tue, 2 Apr 2019 21:18:56 +0000 (14:18 -0700)]
[RESTRICT AUTOMERGE] Careful with screenshots containing secure layers!
For purposes of the screen rotation animation the system server is allowed
to capture secure (not protected) layers and trusted not to persist screenshots
which may contain secure layers. However when displaying the screen rotation animation,
the layer the screenshot is placed on will itself not be secure, so if we record
the animation the recording will contain persisted versions of the secure content. Make sure
we use the new API from SurfaceFlinger to set FLAG_SECURE if our screenshot contains secure
content.
Bug:
69703445
Test: Transaction_test#SetFlagsSecureEUidSystem
Change-Id: I0dd36462867da52e6b1451f65f56c2c5d37538f3
Robert Carr [Fri, 15 Feb 2019 23:48:11 +0000 (15:48 -0800)]
[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server.
In pre-P versions of Android, it was allowed to screenshot secure layers if the
buffer queue producer which was the target of the screenshot was owned by
the system (in this case SurfaceFlinger). This really was a synonym for:
The screen rotation animation was allowed to capture secure layers, but the other
code paths weren't. In O we mistakenly changed this check to always allow the system server
to capture secure layers via the captureScreen path (the captureLayers path used for
TaskSnapshots was unaffected). This can result in data leakage in cases where the
system server takes screenshots on behalf of other parts of the system (e.g. for
the assistant). To mitigate this we provide an explicit switch for the system server
to specify whether it wishes to capture Secure layers. While this is dangerous, I think
it is less dangerous than the previous implicit switch of capturing secure layers based on which
type of BufferQueue was passed in. The flag defaults to not capturing secure layers
and we set it to true in the one place we need it (for the screen rotation animation).
Non privileged clients can still not capture secure layers at all directly.
Test: TransactionTest.cpp#SetFlagsSecureEUidSystem
Bug:
120610669
Change-Id: I9d32c5ac2b005059be9f464859a415167d9ddbd4
Steven Moreland [Thu, 18 Apr 2019 23:32:42 +0000 (16:32 -0700)]
HwBlob: s/malloc/calloc/
Since this blob is passed between processes.
We could potentially only memset portions of the blob as it is
written to. However, the JHwBlob API itself doesn't have to have
writes in order (even though known usages of it do write in order).
Because of this, keeping track of which bytes to pad would be too
expensive.
Bug:
131356202
Test: boot, hidl_test_java
Change-Id: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9
Merged-In: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9
Christopher Dombroski [Tue, 16 Apr 2019 20:21:39 +0000 (13:21 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default
Some system apps may download unknown content and the user should
be explicitly asked whether they trust these files. System apps should
explicitly use the extra NOT_UNKNOWN_SOURCE to bypass this check.
Test: Builds, boots, existing tests pass:
atest CtsPackageInstallTestCases
Locally verified they pass if CtsPackageInstallTestCases.apk was signed by
the platform cert.
Bug:
123700348
Change-Id: I3028bf8ff3f79a41521deeee43fba3c32bb1b2ca
Merged-In: I2578251906f6656b83464d1c4fc4db99165841c9
Eran Messeri [Thu, 11 Apr 2019 03:17:04 +0000 (20:17 -0700)]
[automerger skipped] Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a am:
30826bd658
am:
d89cac1562 -s ours
am skip reason: change_id I8ee3f876fcaffa63636645f0f59709cd147254ef with SHA1
5ab98de315 is in history
Change-Id: I734fd8e0dc271ed7942a8c9d17e5ce19a9cb544d
Julia Reynolds [Thu, 11 Apr 2019 03:06:30 +0000 (20:06 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11 am:
51fee974a9
am:
19ad060bf0
Change-Id: I0ed6effdd52e511fab32a668b8232fc0095e3295
Julia Reynolds [Thu, 11 Apr 2019 03:00:26 +0000 (20:00 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500 am:
5d35ad7446
am:
03cddd8562
Change-Id: Ifa1fe4acb2249480c1b9067e1e53a3f020008859
Pavel Grafov [Thu, 11 Apr 2019 02:49:38 +0000 (19:49 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f am:
3ae9c5c63b -s ours
am:
8a317effc2 -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I50b6c521adf14bad8d30232e9936b16859b4dc03
Eran Messeri [Thu, 11 Apr 2019 02:03:10 +0000 (19:03 -0700)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a
am:
30826bd658
Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c
Julia Reynolds [Thu, 11 Apr 2019 00:44:09 +0000 (17:44 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11
am:
51fee974a9
Change-Id: I5c0f89e5614901b57880fff5b59a2f6766893903
Julia Reynolds [Thu, 11 Apr 2019 00:39:03 +0000 (17:39 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500
am:
5d35ad7446
Change-Id: I0e8dff954426479e5a58f0a8f0dad10a294f7b25
Eran Messeri [Thu, 11 Apr 2019 00:35:21 +0000 (17:35 -0700)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev
am:
07a485743a
Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6
Pavel Grafov [Thu, 11 Apr 2019 00:29:31 +0000 (17:29 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f
am:
3ae9c5c63b -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I1065183419a6868c2f9d21ddae9b455056fbf963
Julia Reynolds [Thu, 11 Apr 2019 00:19:16 +0000 (17:19 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
am:
2256fd4e11
Change-Id: I1658f2dc59428265adf385ec2e9c579abbefb023
Julia Reynolds [Wed, 10 Apr 2019 23:56:01 +0000 (16:56 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev
am:
652a666500
Change-Id: I4e93c29d4d65d14d39b683a27004f871b1dd0b9a
Pavel Grafov [Wed, 10 Apr 2019 23:41:27 +0000 (16:41 -0700)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
am:
20007cb46f
Change-Id: I3bf88bf3a830dc7dea61e32d1df31b273a5d1afe
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-mr2-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-mr1-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-dr1-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge "Permission Check For DPM.getPermittedAccessibilityServices" into nyc-dev
TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c am:
0f19d41748
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into cw-f-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 22:59:44 +0000 (22:59 +0000)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:22:33 +0000 (22:22 +0000)]
Merge "Add cross user permission check - areNotificationsEnabledForPackage" into pi-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8 skipped:
9f3fca716a
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-mr2-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-mr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-dr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge "[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into nyc-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into cw-f-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Pavel Grafov [Wed, 10 Apr 2019 18:47:42 +0000 (11:47 -0700)]
Limit IsSeparateProfileChallengeAllowed to system callers
am:
1b6301cf24
Change-Id: I1145186590622d415c6c10c4750cf9429806bdbe
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
Merged-In: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:06 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
Change-Id: I9f9adc6f9979b3ee946e43150556f0ba971a67f8
Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:01 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88
Change-Id: I9f56349020376c4cb459597bf01cb4956344f7a8
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:56 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e
Change-Id: If32bb0948a2b9aa67b99ceae0ed9234f570198bf
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:51 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697
Change-Id: I064e17eb9e4a91cbf8cda5fe6ee37da48724634d
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:44 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b
Change-Id: Ia35b381b55199cc0c3b516ccc5091993a2c3d488
OSDN Git Service
