Santos Cordon
cc63fe5a0b
Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
...
am: 849302c0f1
2017-04-06 20:30:08 +00:00
Winson Chung
dc40c45d5b
Merge "Disable PiP when VR mode starts." into oc-dev
...
am: d82c58abc5
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
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
2017-04-06 20:11:17 +00:00
Todd Kennedy
573d7a08a8
Merge "change how instant app installer is updated" into oc-dev
...
am: 5b36b4db64
2017-04-06 20:08:04 +00:00
Sudheer Shanka
604aa86034
Merge "ConnectivityService: safer locking" into oc-dev
...
am: 6120db5990
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
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 aea6b74e17
2017-04-06 18:30:11 +00:00
Scott Randolph
b7190e18bf
Merge "Use explicit .c_str() for hidl_string" into oc-dev
...
am: 0576064b00
2017-04-06 18:13:56 +00: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 abcc8e54f6
2017-04-06 18:06:31 +00:00
Rob Carr
acad5c5d4a
Merge "Correct animation glitch for pinned stack." into oc-dev
...
am: 99b72250c2
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
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
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
Chad Brubaker
57a9464831
Merge "Allow permissions to be runtime-only." into oc-dev
...
am: 941e9e2b38
2017-04-06 16:54:50 +00:00
Todd Kennedy
f97938f9d0
Merge "Bind with the correct action" into oc-dev
...
am: e7ec7ec634
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
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
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
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
Adam Lesinski
3afb259cd0
Merge "BatteryStats: Remove too-verbose logging" into oc-dev
...
am: 09612f9435
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
Hugo Benichi
44dfd3aaa5
Merge changes I9ad4ce81,I360d539e am: 9680667b1d am: 4062ac81be
...
am: 84c878ecc8
2017-04-06 02:13:07 +00:00
Hugo Benichi
84c878ecc8
Merge changes I9ad4ce81,I360d539e am: 9680667b1d
...
am: 4062ac81be
2017-04-06 02:07:04 +00:00
Santos Cordon
59ae42ddb2
Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev
...
am: 54d488d4b7
2017-04-06 02:00:29 +00:00
Treehugger Robot
9680667b1d
Merge changes I9ad4ce81,I360d539e
...
* changes:
NsdService: minor cleanups
Nsdmanager/NsdService: add logging
2017-04-06 01:51:36 +00:00
Santos Cordon
54d488d4b7
Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev
2017-04-06 01:48:11 +00:00
Nathan Harold
b077f6abd3
Merge changes from topic 'ipsec-svc-pick' into oc-dev
...
* changes:
Fix Log Traces for IpSecService
SystemServer: fix StartIpSecService trace and log
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup
Change reserveSecurityParameterIndex() to take a remoteAddress
Add a Skeleton IpSecService
2017-04-06 01:34:37 +00:00
Jack Yu
c80ca089dc
Merge "Fixed the obsolete logging" into oc-dev
...
am: 93c2c94c19
2017-04-06 01:15:00 +00:00
TreeHugger Robot
93c2c94c19
Merge "Fixed the obsolete logging" into oc-dev
2017-04-06 01:05:06 +00:00
Adam Lesinski
639345210b
BatteryStats: Remove too-verbose logging
...
Bug: 36972594
Test: manual
Change-Id: I02976ed924550f73010a453d207d199b13307cfa
2017-04-05 17:54:13 -07:00
Peng Xu
58e1a90ba9
Merge "Local geomagnetic field update to sensor" into oc-dev
...
am: 33bbdda3d3
2017-04-06 00:11:52 +00:00
Peng Xu
33bbdda3d3
Merge "Local geomagnetic field update to sensor" into oc-dev
2017-04-06 00:00:11 +00:00
Winson Chung
d70430b070
Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev
...
am: c9fa6399f2
2017-04-05 23:44:50 +00:00
