50208 Commits

Author SHA1 Message Date
Santos Cordon
cc63fe5a0b Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
am: 849302c0f1

Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1
2017-04-06 20:30:08 +00:00
Winson Chung
dc40c45d5b Merge "Disable PiP when VR mode starts." into oc-dev
am: d82c58abc5

Change-Id: I41849e0a00644592fd1e9d0a89a337a5a0a002fa
2017-04-06 20:21:58 +00:00
Jason Monk
79f56babd7 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev
am: e7ac324c71

Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09
2017-04-06 20:20:41 +00:00
TreeHugger Robot
849302c0f1 Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev 2017-04-06 20:17:55 +00:00
Ruben Brunk
93a6f233e6 Merge "Refactor VR state management in ActivityManagerService." into oc-dev
am: e002ce70e3

Change-Id: Id619a22930c52ac82c8526c2a215ee6499320720
2017-04-06 20:11:17 +00:00
Philip P. Moltmann
053c940806 Merge "Do not show UI when currentID changed." into oc-dev
am: ff5eb06e3d

Change-Id: I024dc7344a2c6074f50e06aef6bfb95664d13495
2017-04-06 20:10:13 +00:00
Todd Kennedy
573d7a08a8 Merge "change how instant app installer is updated" into oc-dev
am: 5b36b4db64

Change-Id: Ib870f9783e9462da0837f55ac8a39379c701963a
2017-04-06 20:08:04 +00:00
Sudheer Shanka
604aa86034 Merge "ConnectivityService: safer locking" into oc-dev
am: 6120db5990

Change-Id: I1c22edc7a247d83d860e7016fe7edab1537c5bb7
2017-04-06 20:07:00 +00:00
TreeHugger Robot
d82c58abc5 Merge "Disable PiP when VR mode starts." into oc-dev 2017-04-06 19:59:57 +00:00
Jason Monk
e7ac324c71 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev 2017-04-06 19:51:12 +00:00
TreeHugger Robot
e002ce70e3 Merge "Refactor VR state management in ActivityManagerService." into oc-dev 2017-04-06 19:47:33 +00:00
Philip P. Moltmann
ff5eb06e3d Merge "Do not show UI when currentID changed." into oc-dev 2017-04-06 19:40:48 +00:00
TreeHugger Robot
5b36b4db64 Merge "change how instant app installer is updated" into oc-dev 2017-04-06 19:39:04 +00:00
Sudheer Shanka
6120db5990 Merge "ConnectivityService: safer locking" into oc-dev 2017-04-06 19:37:17 +00:00
Hugo Benichi
0fd4af9ebf ConnectivityService: safer locking
This path changes a dangerous lock path in reportNetworkConnectivity().
This methods is called outside of the main ConnectivityService handler
and takes a lock on a specific NetworkAgentInfo whose connectivity
status is being reported.

While this lock is held, reportNetworkConnectivity() goes on and query
the network policy state for that network, which may ends into
NetworkPolicyManagerService.

Instead, the lock on NetworkAgentInfo is only held long enough to make a
copy of LinkProperties, which is then passed to
NetworkPolicyManagerService without that lock.

Bug: 36902662
Test: could not repro b/36902662, reportNetworkConnectivity() works.
      $ runtest frameworks-net

Change-Id: Iac4b75bcecbdddb0ac695c8b1a87ae755f62f47f
2017-04-06 11:50:09 -07:00
Jason Monk
ba53d8ae41 Revert "Handle case when snapshot dimensions don't match"
This reverts commit aea6b74e17a0f7b105999adad50dd20eac17df35.
Bug: 36991071
Bug: 36703868
Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd
2017-04-06 18:30:11 +00:00
Scott Randolph
b7190e18bf Merge "Use explicit .c_str() for hidl_string" into oc-dev
am: 0576064b00

Change-Id: I6fe3aef2e5c18e8bcc9fb03b4800fc7f8d9c66ab
2017-04-06 18:13:56 +00:00
Philip P. Moltmann
336531523a Do not show UI when currentID changed.
Test: autofill cts tests (no new failures)
Fixes: 36992897
Change-Id: I0c97a84c034533d07544eb3845ff52cdab107f2a
2017-04-06 11:11:50 -07:00
Santos Cordon
da90bd1fc7 Revert "Remove SystemProperty gating-flag for virtual displays."
Test team is still relying on this.  We'll keep this until the virtual display input code goes in this week.

This reverts commit abcc8e54f636bd4eaff5f85d54d5ff8b75508bb9.

Change-Id: Ic591f813289191b09367a76be3221183562256a7
2017-04-06 18:06:31 +00:00
Rob Carr
acad5c5d4a Merge "Correct animation glitch for pinned stack." into oc-dev
am: 99b72250c2

Change-Id: I63652fee54ab90ae855b4a61b745c087f332fb05
2017-04-06 18:05:41 +00:00
Scott Randolph
0576064b00 Merge "Use explicit .c_str() for hidl_string" into oc-dev 2017-04-06 18:01:46 +00:00
Rob Carr
99b72250c2 Merge "Correct animation glitch for pinned stack." into oc-dev 2017-04-06 18:00:21 +00:00
Sudheer Shanka
b0d3b3a5d9 Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev
am: cfeb32287a

Change-Id: I98bfb5020b27db6c3672f30fa0266c5397651a5e
2017-04-06 17:49:36 +00:00
Sudheer Shanka
cfeb32287a Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev 2017-04-06 17:40:58 +00:00
Todd Kennedy
c33cbb21e8 change how instant app installer is updated
. only pay attention to package changes if there's no
  installer or the changed package is the installer
. always update the installer component, even if the
  resolved component is identical [the install paths
  might have updated]

Change-Id: I16eba07ccdb55f5cb61ba6172e71ce1698445fa5
Fixes: 36740490
Test: Manually install/remove/update the installer and see that the component is updated
2017-04-06 10:40:22 -07:00
Svetoslav Ganov
a1dfc0f975 Make sure pending cookie persistence canceled
am: 8aa379e0eb

Change-Id: I84d1f385a85a4ca767b2dfa57b389f86e7b6d9fa
2017-04-06 17:34:54 +00:00
Svetoslav Ganov
8aa379e0eb Make sure pending cookie persistence canceled
When a full app is uninstalled we delete its instant app
cookie but were not canceling a pending write which ended
up having the written cookie file after the app is uninstalled.

Test: InstantCookieHostTest#testCookieResetOnNonInstantReinstall

bug:36455310

Change-Id: Iec6d1f95f8ff731885241913808daf12ce3a5587
2017-04-06 17:28:23 +00:00
Nathan Harold
5601e8836a Merge changes from topic 'ipsec-merge-conflicts' into oc-dev-plus-aosp
* changes:
  Fix Log Traces for IpSecService
  SystemServer: fix StartIpSecService trace and log
2017-04-06 17:17:20 +00:00
Chad Brubaker
57a9464831 Merge "Allow permissions to be runtime-only." into oc-dev
am: 941e9e2b38

Change-Id: I2b1b3a53e6609cc335b4efa9084e603986f58bbe
2017-04-06 16:54:50 +00:00
Todd Kennedy
f97938f9d0 Merge "Bind with the correct action" into oc-dev
am: e7ec7ec634

Change-Id: I761c5e112a75aa7314821f36c932e98b90be1aec
2017-04-06 16:44:58 +00:00
Chad Brubaker
941e9e2b38 Merge "Allow permissions to be runtime-only." into oc-dev 2017-04-06 16:44:11 +00:00
Winson Chung
f1bfee1ca2 Disable PiP when VR mode starts.
Bug: 36214284
Test: Ensure that PiP is stopped when VR is enabled.
Change-Id: Ib537e1f360be7b47199d230e5691f6fece0f925f
2017-04-06 09:37:59 -07:00
Ruben Brunk
279d34af31 Refactor VR state management in ActivityManagerService.
- Move VR-related state from ActivityManagerService into
  VrController.
- Move VR-related render thread scheduling logic from
  ActivityManagerService into VrController.
- Update state logic to better enforce invariants.

Bug: 36214284

Test: Covered by existing tests.
Change-Id: I02d1488da0c0f65a10dd0369f38f1a0c47cee174
2017-04-06 09:36:56 -07:00
TreeHugger Robot
e7ec7ec634 Merge "Bind with the correct action" into oc-dev 2017-04-06 16:35:37 +00:00
Calin Juravle
50d47492f1 Merge "Keep track of protected data dirs in DexManager" into oc-dev
am: 539128f6d6

Change-Id: I8eb1a7e5300fff4861387a82ce9d47afb1764946
2017-04-06 16:03:41 +00:00
Calin Juravle
539128f6d6 Merge "Keep track of protected data dirs in DexManager" into oc-dev 2017-04-06 15:55:04 +00:00
Julia Reynolds
4c6d2c76a4 Merge "Remove unneeded methods" into oc-dev
am: 9a8f641801

Change-Id: I5532580c81fcb337bf7a7d22cf148b72f73ba8f6
2017-04-06 15:19:51 +00:00
Julia Reynolds
9a8f641801 Merge "Remove unneeded methods" into oc-dev 2017-04-06 15:13:13 +00:00
Tony Mak
bd24ce1d0b Merge "Do not stop lock task if it is starting background user" into oc-dev
am: 343715b1c1

Change-Id: Icf08aa23cca59f81f8dc3ca7c5f285e23953bb2b
2017-04-06 13:29:52 +00:00
TreeHugger Robot
343715b1c1 Merge "Do not stop lock task if it is starting background user" into oc-dev 2017-04-06 13:24:48 +00:00
Felipe Leme
3dac19b040 Merge "Pass FillResponse bundle on subsequent onFillRequest() calls." into oc-dev
am: 84705f9fb9

Change-Id: I044ab29d793b8fa5a1ce7830e61205b8240f2fef
2017-04-06 06:31:15 +00:00
TreeHugger Robot
84705f9fb9 Merge "Pass FillResponse bundle on subsequent onFillRequest() calls." into oc-dev 2017-04-06 06:24:07 +00:00
TreeHugger Robot
0b7d43c985 Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" into oc-dev 2017-04-06 04:54:47 +00:00
Joel Scherpelz
6e5d86f76b Partially revert "Add blocking and retrying wrappers for INetd uses."
Direct access to Netd from the bluetooth process is disallowed by
SELinux policy. This change reverts to the old behavior where IpManager
interacts with NetdService indirectly via NetworkManagementService.

Test: as follows:
    - built (sailfish)
    - flashed
    - booted
    - established bluetooth tethering to another device, ping'd 8.8.8.8
Bug: 36492299

This partially reverts commit af39244a34f4449c12a5f925222c9bc8d8049320.

Change-Id: Icf20b1e24abf7dd3123760f8637928bde7afe06b
2017-04-06 12:01:42 +09:00
Adam Lesinski
3afb259cd0 Merge "BatteryStats: Remove too-verbose logging" into oc-dev
am: 09612f9435

Change-Id: I75a4a6eca5e4004c2496b307183ed2ecc730946b
2017-04-06 02:44:59 +00:00
TreeHugger Robot
09612f9435 Merge "BatteryStats: Remove too-verbose logging" into oc-dev 2017-04-06 02:38:59 +00:00
Felipe Leme
52d5d3dfc7 Pass FillResponse bundle on subsequent onFillRequest() calls.
BUG: 35707731

Test: existing CtsAutoFillServiceTestCases pass
Test: more tests on PartitionedActivityTest

Change-Id: I510aff54d0d9d7e0cce90f9786e3e1f6cab180f9
2017-04-05 19:34:33 -07:00
Felipe Leme
5f73ae55ee Merge "Improvements on ViewNodes received on partitioned requests:" into oc-dev
am: 05b8b4135a

Change-Id: I827bb35c95b260365388ce84eecc2db68c6628ef
2017-04-06 02:32:41 +00:00
TreeHugger Robot
05b8b4135a Merge "Improvements on ViewNodes received on partitioned requests:" into oc-dev 2017-04-06 02:26:37 +00:00
Nathan Harold
8f032dd16b Fix Log Traces for IpSecService
Bug: 36920223
Test: boot and see full log
Change-Id: I1ac53f172094082c53b53a950058c862d257b7e5
(cherry picked from commit d3e3f1593a523d488c76be2494d94a399e52dc9d)
(cherry picked from commit a8a74e25ddb27a350c8f643590639b9131fae2e1)
2017-04-05 19:14:49 -07:00