Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
534,057 Commits 3 Branches 0 Tags
d50178eae651d527638460836494f59eedf0809c
Commit Graph

107566 Commits

Author SHA1 Message Date
Leon Scroggins
d50178eae6 Merge "Switch Java calls to enableZ and disableZ; remove isRecordingFor" 2020-05-07 18:07:22 +00:00
Alex Johnston
5d3555b906 Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04 am: 315330edb0 am: 3e76e54db7 am: 3078b2c567 
Change-Id: I34c8f3b5037f06a7171e9a39f60fc05a03cf9b33
 2020-05-07 15:49:10 +00:00
Alex Johnston
3078b2c567 Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04 am: 315330edb0 am: 3e76e54db7 
Change-Id: I0b181c5e6628e28a7fe2d170e548b2fc709b3f06
 2020-05-07 15:42:59 +00:00
Alex Johnston
315330edb0 Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04 
Change-Id: I1d550d75a37873ba460e14e99982ca48bc72d494
 2020-05-07 15:32:18 +00:00
Alex Johnston
80542add04 Merge "Restrict creation of secondary users" into rvc-dev 2020-05-07 15:20:31 +00:00
Alex Johnston
451d4a697b Merge "Deprecate organization color" 2020-05-07 13:38:01 +00:00
Alex Johnston
9ace11127c Restrict creation of secondary users 
Background
* Secondary users should be disabled
  when the device is an organization-owned
  managed profile device.
* This is because supporting secondary
  users would complicate the semantics of
  user restrictions.

Changes
* Add DISALLOW_ADD_USER as a base restriction
  when the device is an organization-owned
  managed profile device.
* Handle removal case when the device is no
  longer in this mode.
* Remove the ability of other admins to apply
  DISALLOW_ADD_USER.

Manual Testing Steps
* Provision an organization-owned managed
  profile device.
* Check Settings > System > Multiple users
  and verify that a user cannot be added.
* Check WP TestDPC 'Set user restrictions
  on parent' and verify 'Disallow add user'
  is not present.

Bug: 155281701
Test: Manual testing
      atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I83348fc8b854cef20383803124000540b5b130cb
 2020-05-07 13:58:31 +01:00
Jorim Jaggi
2a15b259dc Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c20c5a5de1 am: 356e907d3b am: b429d3b936 
Change-Id: I8262ff6c0aa2eef95a521535e10f98ae5f81be83
 2020-05-07 12:37:10 +00:00
Jorim Jaggi
356e907d3b Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c20c5a5de1 
Change-Id: I0565254b0398e71e789ed3229e480dbb86f0c6da
 2020-05-07 12:10:13 +00:00
Jorim Jaggi
c20c5a5de1 Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 
Change-Id: I5138c2ed3d2aa43e8c0cbe8ff5e5a88a3d47689c
 2020-05-07 11:53:24 +00:00
Jorim Jaggi
b3c02592e1 Merge "Cancel existing animations when detaching View" into rvc-dev 2020-05-07 11:36:11 +00:00
Feng Cao
571fa86530 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: f9748230fd am: 35c8ea2a8b am: 9c116694b4 
Change-Id: Ic8bdf26c2194d779d9d313d8cfb30b65857064c4
 2020-05-07 06:15:23 +00:00
Philip P. Moltmann
65de8f996e Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 2ed0952744 am: 09fd12d9bf am: 7dc20cffc2 
Change-Id: I1e22754721fb15ba1f20fa05881dec202dd44b1b
 2020-05-07 06:11:34 +00:00
Feng Cao
9c116694b4 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: f9748230fd am: 35c8ea2a8b 
Change-Id: I2b549cbf295b8d4a926b8a0e0d069a2b746d8c32
 2020-05-07 05:56:23 +00:00
Feng Cao
c2f8606e32 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 am: 03f9fbbf3d 
Change-Id: I8b638d30584965de95819a8cd71d0621c7060cf1
 2020-05-07 05:38:22 +00:00
Philip P. Moltmann
09fd12d9bf Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c am: 2ed0952744 
Change-Id: Ie3e2a56ea85000d760a9abe23ead133236b764bb
 2020-05-07 05:38:10 +00:00
Feng Cao
f9748230fd Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 
Change-Id: I7a7655f90cdbf924635d6bcd48898fbd22aec1eb
 2020-05-07 05:28:51 +00:00
Feng Cao
03f9fbbf3d Merge "Support re-attaching the inline suggestion view to window" into rvc-dev am: 254545cae5 
Change-Id: Id4d01aa1c63b2b1d4d3658a6141b8c0dd05c6c20
 2020-05-07 05:28:49 +00:00
Riddle Hsu
29c9df03e2 Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df am: 10662e54cc am: c6c8c58fa2 am: e18411cbf0 
Change-Id: I3220c7719ff2bb274584c6e1ad8a9f89699ec7c7
 2020-05-07 05:23:45 +00:00
Feng Cao
254545cae5 Merge "Support re-attaching the inline suggestion view to window" into rvc-dev 2020-05-07 05:23:15 +00:00
Philip P. Moltmann
2ed0952744 Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c 
Change-Id: I6a179fc69d68b70107de794c113c6acfcef67f3f
 2020-05-07 05:22:23 +00:00
Philip P. Moltmann
841af79daa Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev am: f7d1f1a40c 
Change-Id: Id1d9ee52437c9bd5b12eb24d38ab07a6fced6543
 2020-05-07 05:21:44 +00:00
Philip P. Moltmann
f7d1f1a40c Merge "Forward dumps from PermissionControllerManager to permissionmgr" into rvc-dev 2020-05-07 05:07:27 +00:00
Riddle Hsu
c6c8c58fa2 Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df am: 10662e54cc 
Change-Id: I8c89cbf67d648878c71c92574ce89090fc2de6bd
 2020-05-07 04:59:50 +00:00
Riddle Hsu
10662e54cc Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df 
Change-Id: I82ddd309228f5e10c3fde31b7b3eb907f8c43d14
 2020-05-07 04:59:20 +00:00
Riddle Hsu
4dfd3dcd3a Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df 
Change-Id: I5d0b57b38d31f6f466ef1ecf1b63b5e3a98248de
 2020-05-07 04:59:11 +00:00
Riddle Hsu
b76f9472df Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev 2020-05-07 04:51:38 +00:00
Kevin Chyn
874aefe9e9 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 am: a7cd89885f am: 280e561a86 am: 0fe956cfc1 
Change-Id: I640ab239ba72ef7a0df96c829938a8fb92ff6c6f
 2020-05-07 02:33:44 +00:00
Feng Cao
b46851c964 Support re-attaching the inline suggestion view to window 
* Before this change, when the inline suggestion view is detached from
  the IME window (e.g. due to layout change), the remote view content
  will not show again even after the view is reattached to the window
  on the IME side. This patch fixes it by requesting the remote view
  owner (the ext services) for a new SurfacePackage when the view is
  re-attached to the window (see javadoc of SurfaceControlViewHost for
  why this works).
* This patch also fixes the issue where the SurfaceControlViewHost was
  never released in the ext services. This is done by notifying the
  ext services (through system server) when the view is detached from
  the IME window, and then the system server will release the
  SurfaceControlViewHost if after N(=500) ms the view is not re-attached
  to a window.
* After the SurfaceControlViewHost is released, if the view is
  re-attached to the window later, a new SurfaceControlViewHost will be
  created to back the same InlineContentView.
* The current code structure also lays a foundation for a subsequent
  change to allow reusing the same remote view for inline suggestions
  during filtering.

Test: atest CtsAutofillServiceTestCases (sanity test)

Bug: 153615023
Bug: 154683107

Change-Id: Idc587e1e82a96b792c351796464821b7aad7cd89
 2020-05-06 19:30:39 -07:00
Kevin Chyn
0fe956cfc1 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 am: a7cd89885f am: 280e561a86 
Change-Id: Idae5dd7f8385a913a182579fdda41d29d2a7d986
 2020-05-07 02:12:02 +00:00
Kevin Chyn
88a4a7d69d Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 am: c9f88f5f9b 
Change-Id: Ieb856198013a2b49c07b06aa2c680e06312e9bc7
 2020-05-07 02:01:00 +00:00
Kevin Chyn
c9f88f5f9b Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 
Change-Id: I41afc5ebca9de5f069dabcea03736fffc0b3c01c
 2020-05-07 01:44:04 +00:00
Kevin Chyn
a7cd89885f Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 am: 73407d6559 
Change-Id: Ib6fb70d916824d136e808bcd26b092ddf2d359ba
 2020-05-07 01:43:52 +00:00
Kevin Chyn
73407d6559 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 am: 38691f7626 
Change-Id: I2179cb6e443d25c859ab6c433b11aec63153f256
 2020-05-07 01:28:25 +00:00
Kevin Chyn
38691f7626 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 am: c1f5869518 
Change-Id: I1ea9173d607acdcbd03de42aa793b018c23828e3
 2020-05-07 01:15:56 +00:00
Kevin Chyn
c1f5869518 Merge "Revert "Check Read permissions when getDocumentMetadata"" into pi-dev am: 3d599fd941 
Change-Id: I18eb6c4cd9c42f3cc1d1051b47aafeeffb6b0c16
 2020-05-07 01:02:48 +00:00
Kevin Chyn
f21b907b1b Revert "Check Read permissions when getDocumentMetadata" 
This reverts commit c94646177c.

Reason for revert: 155930637

Change-Id: Id452d316d1c1721fce715474df009ebe0fb719e8
 2020-05-07 00:39:46 +00:00
Philip P. Moltmann
5ab27fca5c Forward dumps from PermissionControllerManager to permissionmgr 
Test: adb shell dumpsys permissionmgr
Bug: 155680199
Change-Id: Iab5da24277eb6333ef047ab84dfcb65b7c4c2ff2
 2020-05-06 17:24:40 -07:00
Diksha Gohlyan
3bea45c642 Merge "Check Read permissions when getDocumentMetadata" into pi-dev am: 4371baafc1 am: ada451e47c 
Change-Id: Id40f7456923144e3496df2028c771325ad1f480e
 2020-05-06 23:16:07 +00:00
Diksha Gohlyan
ada451e47c Merge "Check Read permissions when getDocumentMetadata" into pi-dev am: 4371baafc1 
Change-Id: Ib242d6ed7ff376a71f85a03aa06f2c0453638310
 2020-05-06 23:05:34 +00:00
Taran Singh
0efe92c61a Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd am: 57305841de am: 1e9ccb8a60 am: deb5c075ea 
Change-Id: I684742c848ba4fbd44763f86e0076a92f1fe265f
 2020-05-06 22:14:54 +00:00
Galia Peycheva
d8a36ac81c Merge "Override DreamActivity enter and exit animations" into rvc-dev am: 1255a2d20b am: ca823fb574 am: 060444d9ce am: bc7e2eb369 
Change-Id: I68808bce07f37393c43f38ba79c1a59e54299f4a
 2020-05-06 21:35:33 +00:00
Taran Singh
1e9ccb8a60 Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd am: 57305841de 
Change-Id: I5d0903587fd707870f71ce24e04291aaf9dc7dac
 2020-05-06 21:35:13 +00:00
Taran Singh
57305841de Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd 
Change-Id: Iffb78dd8a44993c06a64ae17e32055fd310589e6
 2020-05-06 21:22:04 +00:00
Taran Singh
b2988f3e4f Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd 
Change-Id: I82c5d52bd8d07fd9c6aefbc123b5f05f4b61426f
 2020-05-06 21:21:48 +00:00
Taran Singh
e974c347fd Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev 2020-05-06 21:06:34 +00:00
Galia Peycheva
060444d9ce Merge "Override DreamActivity enter and exit animations" into rvc-dev am: 1255a2d20b am: ca823fb574 
Change-Id: I19e4f72ce00e6273b8ba605af49b687cf88a5a96
 2020-05-06 21:02:31 +00:00
Galia Peycheva
42eb496b40 Merge "Override DreamActivity enter and exit animations" into rvc-dev am: 1255a2d20b 
Change-Id: Ibc4831e10a9e2358eb6dc9f68e3608c52409a53c
 2020-05-06 20:46:43 +00:00
Galia Peycheva
ca823fb574 Merge "Override DreamActivity enter and exit animations" into rvc-dev am: 1255a2d20b 
Change-Id: I97d1d9f9e45c1430b02907a29f8cfc1a7fca4c1f
 2020-05-06 20:46:39 +00:00
Taran Singh
0dbd6c4bd6 Revert "Keeps the served view of the window when focus to the ne..." 
Revert "Refine FocusHandlingTest"

Revert submission 11182377-fix_b_152373385

Reason for revert: Fix b/155781821
Reverted Changes:
If20cdb43e:Keeps the served view of the window when focus to ...
I50402165b:Refine FocusHandlingTest
Bug: 152373385
Bug: 155781821

Change-Id: I44469caf5a5ceaf247c4e6b0694da9da1f3c0eb1
 2020-05-06 20:37:09 +00:00