OSDN Git Service
jackqdyulei [Thu, 6 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add lower case charging string." into oc-dev
am:
e263940142
Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
TreeHugger Robot [Thu, 6 Apr 2017 22:30:45 +0000 (22:30 +0000)]
Merge "Add lower case charging string." into oc-dev
Felipe Leme [Thu, 6 Apr 2017 22:30:09 +0000 (22:30 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev
am:
7a7c0ace82
Change-Id: I538be771db63f10a6383495147c32848fabe55cd
Steven Moreland [Thu, 6 Apr 2017 22:28:30 +0000 (22:28 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev
am:
610b55e8bc
Change-Id: I38941d30137bc8ff525d8acc9a4cd04d5d59d975
TreeHugger Robot [Thu, 6 Apr 2017 22:20:45 +0000 (22:20 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev
jackqdyulei [Thu, 6 Apr 2017 22:17:47 +0000 (22:17 +0000)]
Merge "Add showChargingMethod in BatteryInfo" into oc-dev
am:
5883a40931
Change-Id: Ic110cc08f3bcd4720210744531703e0be15c9371
Sudheer Shanka [Thu, 6 Apr 2017 22:16:43 +0000 (22:16 +0000)]
Merge "Add tests for verifying network availability on activity start." into oc-dev
am:
e78467f671
Change-Id: I100f167996514b985e6aa2b3767b75cf41d7539e
TreeHugger Robot [Thu, 6 Apr 2017 22:15:04 +0000 (22:15 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:14:48 +0000 (22:14 +0000)]
Merge "Fix testWaitForNetworkStateUpdate." into oc-dev
am:
d17ebaba9a
Change-Id: I80c1b94e2ef6bdc02209ed6a2b7f388f926c9c06
TreeHugger Robot [Thu, 6 Apr 2017 22:06:21 +0000 (22:06 +0000)]
Merge "Add showChargingMethod in BatteryInfo" into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:06:14 +0000 (22:06 +0000)]
Merge "Add tests for verifying network availability on activity start." into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 22:05:51 +0000 (22:05 +0000)]
Merge "Fix testWaitForNetworkStateUpdate." into oc-dev
Romain Guy [Thu, 6 Apr 2017 21:39:20 +0000 (21:39 +0000)]
Merge "Rename getIntent() to getRenderIntent()" into oc-dev
am:
b2bb3bf268
Change-Id: I10652933266e3eb976244de9e7b1ddeab4fe7c87
TreeHugger Robot [Thu, 6 Apr 2017 21:34:13 +0000 (21:34 +0000)]
Merge "Rename getIntent() to getRenderIntent()" into oc-dev
Romain Guy [Thu, 6 Apr 2017 21:30:17 +0000 (21:30 +0000)]
Merge changes I6f00614d,I987eeab2 into oc-dev
am:
c273784c91
Change-Id: I732b93decc6ce9b3a846c971ff25484447ff9127
TreeHugger Robot [Thu, 6 Apr 2017 21:21:55 +0000 (21:21 +0000)]
Merge changes I6f00614d,I987eeab2 into oc-dev
* changes:
Convert 16 bit bitmaps to 8 bit on devices that do not have GLES3.0
Fix HardwareBitmapTests.testBitmapConfigFromRGB565
Roozbeh Pournader [Thu, 6 Apr 2017 21:20:03 +0000 (21:20 +0000)]
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
am:
43fed9afe4
Change-Id: I3c077353adf8040118b0610248848fe3d552a70e
Roozbeh Pournader [Thu, 6 Apr 2017 21:18:57 +0000 (21:18 +0000)]
Merge "Force direction of phone number fields to (practically) LTR" into oc-dev
am:
0dc7596ee3
Change-Id: I10ad0deefcc24276c376816e8b7482f64d040023
Felipe Leme [Thu, 6 Apr 2017 21:17:45 +0000 (21:17 +0000)]
Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev
am:
11d1a392f2
Change-Id: Icd09a38a7ef4942578719574004a11d695a6dc92
Roozbeh Pournader [Thu, 6 Apr 2017 21:13:22 +0000 (21:13 +0000)]
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
Roozbeh Pournader [Thu, 6 Apr 2017 21:13:01 +0000 (21:13 +0000)]
Merge "Force direction of phone number fields to (practically) LTR" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 21:06:43 +0000 (21:06 +0000)]
Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev
Philip P. Moltmann [Thu, 6 Apr 2017 20:49:53 +0000 (20:49 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" am:
b2c75d062d am:
997f7cbabf
am:
41687d06f4
Change-Id: Iddb64b94c03eaf6925d9b4e161ac3c6fdd25a1b8
Philip P. Moltmann [Thu, 6 Apr 2017 20:42:50 +0000 (20:42 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" am:
b2c75d062d
am:
997f7cbabf
Change-Id: I2b784f49097426922e833f102e1f28fc4dc99357
Sundeep Ghuman [Thu, 6 Apr 2017 20:40:11 +0000 (20:40 +0000)]
Merge "Update comment on why Keep is needed." into oc-dev
am:
696a83b0c7
Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef
Kang Li [Thu, 6 Apr 2017 20:37:09 +0000 (20:37 +0000)]
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am:
5a0ee44ce5
Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
Philip P. Moltmann [Thu, 6 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"
am:
b2c75d062d
Change-Id: I4b018ac9763d9bf5c69d055b4a9d5ddf6dded3cb
TreeHugger Robot [Thu, 6 Apr 2017 20:32:37 +0000 (20:32 +0000)]
Merge "Update comment on why Keep is needed." into oc-dev
Santos Cordon [Thu, 6 Apr 2017 20:30:08 +0000 (20:30 +0000)]
Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
am:
849302c0f1
Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1
TreeHugger Robot [Thu, 6 Apr 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
Treehugger Robot [Thu, 6 Apr 2017 20:23:13 +0000 (20:23 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"
Winson Chung [Thu, 6 Apr 2017 20:21:58 +0000 (20:21 +0000)]
Merge "Disable PiP when VR mode starts." into oc-dev
am:
d82c58abc5
Change-Id: I41849e0a00644592fd1e9d0a89a337a5a0a002fa
Jason Monk [Thu, 6 Apr 2017 20:20:41 +0000 (20:20 +0000)]
Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev
am:
e7ac324c71
Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09
jackqdyulei [Mon, 3 Apr 2017 18:31:40 +0000 (11:31 -0700)]
Add lower case charging string.
The previous charging string is "75% - Charging", this cl add lower
case string to make it "75% - charging".
Bug:
36558216
Test: Build
Change-Id: I683843de0b6cbd45bea6a465c7b6d8ee0b7c4f93
TreeHugger Robot [Thu, 6 Apr 2017 20:17:51 +0000 (20:17 +0000)]
Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev
jackqdyulei [Fri, 24 Mar 2017 19:13:49 +0000 (12:13 -0700)]
Add showChargingMethod in BatteryInfo
This toggle is used to decide whether to show charging method.
If it is off, then "Charging over ac" will become "Charging"
Bug:
36558216
Test: RunSettingsLibRoboTests
Change-Id: I98b1f7e7b77d7ce0a7e1aae29e55a33ac79ff0d7
(cherry picked from commit
b3c33f63ed120cf4758ec67426bb45291e289fce)
Matt Sarett [Thu, 6 Apr 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev
am:
c29dffed16
Change-Id: I5a62876593d2e4423758bce57c8b82e9bdb3864c
Ruben Brunk [Thu, 6 Apr 2017 20:11:17 +0000 (20:11 +0000)]
Merge "Refactor VR state management in ActivityManagerService." into oc-dev
am:
e002ce70e3
Change-Id: Id619a22930c52ac82c8526c2a215ee6499320720
Philip P. Moltmann [Thu, 6 Apr 2017 20:10:13 +0000 (20:10 +0000)]
Merge "Do not show UI when currentID changed." into oc-dev
am:
ff5eb06e3d
Change-Id: I024dc7344a2c6074f50e06aef6bfb95664d13495
Chad Brubaker [Thu, 6 Apr 2017 20:09:06 +0000 (20:09 +0000)]
Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev
am:
6de4ea56f7
Change-Id: Ibdf483d6b40ac30f78e3e6e4a024c7da2354831d
Todd Kennedy [Thu, 6 Apr 2017 20:08:04 +0000 (20:08 +0000)]
Merge "change how instant app installer is updated" into oc-dev
am:
5b36b4db64
Change-Id: Ib870f9783e9462da0837f55ac8a39379c701963a
Sudheer Shanka [Thu, 6 Apr 2017 20:07:00 +0000 (20:07 +0000)]
Merge "ConnectivityService: safer locking" into oc-dev
am:
6120db5990
Change-Id: I1c22edc7a247d83d860e7016fe7edab1537c5bb7
Felipe Leme [Thu, 6 Apr 2017 20:04:53 +0000 (20:04 +0000)]
Merge "Fixed Autofill NPE that crashed some apps." into oc-dev
am:
75d0d92f7b
Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2
TreeHugger Robot [Thu, 6 Apr 2017 19:59:53 +0000 (19:59 +0000)]
Merge "Disable PiP when VR mode starts." into oc-dev
Jason Monk [Thu, 6 Apr 2017 19:51:03 +0000 (19:51 +0000)]
Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 19:48:40 +0000 (19:48 +0000)]
Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 19:47:29 +0000 (19:47 +0000)]
Merge "Refactor VR state management in ActivityManagerService." into oc-dev
Roozbeh Pournader [Wed, 5 Apr 2017 01:27:10 +0000 (18:27 -0700)]
Force direction of phone number fields to (practically) LTR
Previously, phone number fields defaulted to locale direction, which
created problems for apps that were not aware of LTR requirements for
phone numbers.
Now, we look at the direction of the digits for the locale, and use
that to determine the direction of the edit field. (For practically
all major RTL locales, that direction is LTR.)
Test: Manual
Bug:
33643035
Change-Id: I17c70d8462bd403ea6866057971105f1f5772ba3
Philip P. Moltmann [Thu, 6 Apr 2017 19:40:42 +0000 (19:40 +0000)]
Merge "Do not show UI when currentID changed." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 19:40:22 +0000 (19:40 +0000)]
Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 19:39:00 +0000 (19:39 +0000)]
Merge "change how instant app installer is updated" into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 19:37:11 +0000 (19:37 +0000)]
Merge "ConnectivityService: safer locking" into oc-dev
Romain Guy [Thu, 6 Apr 2017 19:37:03 +0000 (12:37 -0700)]
Rename getIntent() to getRenderIntent()
Bug:
37077433
Test: compile and ColorSpaceTests
Change-Id: I8eb1fa6136582eaac1d509ebfef7f67b0fffe1aa
Felipe Leme [Thu, 6 Apr 2017 19:36:16 +0000 (19:36 +0000)]
Merge "Fixed Autofill NPE that crashed some apps." into oc-dev
Romain Guy [Thu, 6 Apr 2017 19:24:29 +0000 (12:24 -0700)]
Convert 16 bit bitmaps to 8 bit on devices that do not have GLES3.0
Bug:
37077308
Test: CtsUiRenderingTests (ran to manually emulate 2.0 devices)
Change-Id: I6f00614d79797835adcfe4716bd331573e1463e3
Hugo Benichi [Thu, 6 Apr 2017 07:01:44 +0000 (16:01 +0900)]
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
Junda Liu [Thu, 6 Apr 2017 18:39:43 +0000 (18:39 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am:
ded8a6b7f6 am:
c86e5802c6
am:
efb72ba71c
Change-Id: Ib678a10ef5d4792581c40d8ac15a183604d35ba2
Junda Liu [Thu, 6 Apr 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am:
ded8a6b7f6
am:
c86e5802c6
Change-Id: I9ea249ed0837c8501f62154bec5c36d47a0e67e0
Jason Monk [Thu, 6 Apr 2017 18:28:19 +0000 (18:28 +0000)]
Revert "Handle case when snapshot dimensions don't match"
This reverts commit
aea6b74e17a0f7b105999adad50dd20eac17df35.
Bug:
36991071
Bug:
36703868
Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd
Junda Liu [Thu, 6 Apr 2017 18:25:10 +0000 (18:25 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
am:
ded8a6b7f6
Change-Id: I12f28266088cd9565d62097477c69dcb5ece54e2
Jason Monk [Thu, 6 Apr 2017 18:24:54 +0000 (18:24 +0000)]
Merge "Ignore a broken test until it can be fixed." into oc-dev
am:
eb93670383
Change-Id: Ie8b63c5dcdf7461a2a5d3baf12c400ec73ea3fb8
Junda Liu [Thu, 6 Apr 2017 18:17:39 +0000 (18:17 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
Scott Randolph [Thu, 6 Apr 2017 18:13:56 +0000 (18:13 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev
am:
0576064b00
Change-Id: I6fe3aef2e5c18e8bcc9fb03b4800fc7f8d9c66ab
Philip P. Moltmann [Thu, 6 Apr 2017 17:36:32 +0000 (10:36 -0700)]
Do not show UI when currentID changed.
Test: autofill cts tests (no new failures)
Fixes:
36992897
Change-Id: I0c97a84c034533d07544eb3845ff52cdab107f2a
Kang Li [Wed, 5 Apr 2017 19:30:55 +0000 (12:30 -0700)]
Add a service to rank apps for ResolverActivity.
bug:
36952725,
30982298
Test: used PTP before and after this fix.
Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
Rob Carr [Thu, 6 Apr 2017 18:07:50 +0000 (18:07 +0000)]
Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev
am:
0b504559ee
Change-Id: I784b58f59acf7ed91e37d70e57c076734814aa9e
Santos Cordon [Thu, 6 Apr 2017 18:06:31 +0000 (18:06 +0000)]
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
Rob Carr [Thu, 6 Apr 2017 18:05:41 +0000 (18:05 +0000)]
Merge "Correct animation glitch for pinned stack." into oc-dev
am:
99b72250c2
Change-Id: I63652fee54ab90ae855b4a61b745c087f332fb05
TreeHugger Robot [Thu, 6 Apr 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Ignore a broken test until it can be fixed." into oc-dev
Scott Randolph [Thu, 6 Apr 2017 18:01:41 +0000 (18:01 +0000)]
Merge "Use explicit .c_str() for hidl_string" into oc-dev
Rob Carr [Thu, 6 Apr 2017 18:00:50 +0000 (18:00 +0000)]
Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev
Romain Guy [Thu, 6 Apr 2017 18:00:21 +0000 (11:00 -0700)]
Fix HardwareBitmapTests.testBitmapConfigFromRGB565
Bug:
37077304
Test: HardwareBitmapTests.testBitmapConfigFromRGB565
Change-Id: I987eeab243f93f9ee8fe8d1b6a12ddbd23225651
Rob Carr [Thu, 6 Apr 2017 18:00:16 +0000 (18:00 +0000)]
Merge "Correct animation glitch for pinned stack." into oc-dev
Jeff Tinker [Thu, 6 Apr 2017 17:56:30 +0000 (17:56 +0000)]
Merge "Fix StringDef usage in MediaDrm API" into oc-dev
am:
d2b1f3812c
Change-Id: Ide47e76bd45fe1f50588b4d2fc3f124196ec9769
TreeHugger Robot [Thu, 6 Apr 2017 17:50:18 +0000 (17:50 +0000)]
Merge "Fix StringDef usage in MediaDrm API" into oc-dev
Sudheer Shanka [Thu, 6 Apr 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev
am:
cfeb32287a
Change-Id: I98bfb5020b27db6c3672f30fa0266c5397651a5e
Sudheer Shanka [Thu, 6 Apr 2017 17:40:54 +0000 (17:40 +0000)]
Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev
Todd Kennedy [Tue, 4 Apr 2017 22:16:36 +0000 (15:16 -0700)]
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
Felipe Leme [Thu, 6 Apr 2017 00:11:01 +0000 (17:11 -0700)]
Shows a Toast when manual autofill request cannot be fulfilled.
Bug:
35708229
Test: manual verification
Change-Id: If4fa6556dd94a805727329f0aebc4b37f548b3a1
Svetoslav Ganov [Thu, 6 Apr 2017 17:34:54 +0000 (17:34 +0000)]
Make sure pending cookie persistence canceled
am:
8aa379e0eb
Change-Id: I84d1f385a85a4ca767b2dfa57b389f86e7b6d9fa
Svetoslav Ganov [Wed, 5 Apr 2017 01:12:27 +0000 (18:12 -0700)]
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
Chad Brubaker [Fri, 10 Mar 2017 21:31:38 +0000 (13:31 -0800)]
Expose ConfigUpdater Intents in SystemApi
The Intents are are in the android namespace and should have been
exposed as SystemApi, but were not previously.
Since there are no classes in the framework that reference these Intents
this adds android.os.ConfigUpdate to have them all in one place.
Test: builds
Change-Id: I2086945301f06b28b491ec876652c37e97315e8c
Fixes:
35252508
Fixes:
35266806
Fixes:
35266833
Fixes:
35271111
(cherry picked from commit
987b0fc4a57c8b8246b12069a5db06693bc3eea6)
Nathan Harold [Thu, 6 Apr 2017 17:17:16 +0000 (17:17 +0000)]
Merge changes from topic 'ipsec-merge-conflicts' into oc-dev-plus-aosp
* changes:
Fix Log Traces for IpSecService
SystemServer: fix StartIpSecService trace and log
Julia Reynolds [Thu, 6 Apr 2017 17:01:18 +0000 (17:01 +0000)]
Merge "Fix build" into oc-dev
am:
0b47e289c8
Change-Id: Ic1c373a21b2c38cdc6a3c3491bb3080367401519
Chad Brubaker [Thu, 6 Apr 2017 16:54:50 +0000 (16:54 +0000)]
Merge "Allow permissions to be runtime-only." into oc-dev
am:
941e9e2b38
Change-Id: I2b1b3a53e6609cc335b4efa9084e603986f58bbe
Julia Reynolds [Thu, 6 Apr 2017 16:45:04 +0000 (16:45 +0000)]
Merge "Fix build" into oc-dev
Todd Kennedy [Thu, 6 Apr 2017 16:44:58 +0000 (16:44 +0000)]
Merge "Bind with the correct action" into oc-dev
am:
e7ec7ec634
Change-Id: I761c5e112a75aa7314821f36c932e98b90be1aec
Chad Brubaker [Thu, 6 Apr 2017 16:44:07 +0000 (16:44 +0000)]
Merge "Allow permissions to be runtime-only." into oc-dev
Felipe Leme [Thu, 6 Apr 2017 16:39:01 +0000 (09:39 -0700)]
Fixed Autofill NPE that crashed some apps.
It happened when views provided an Accessibility node that had children.
Bug:
37078783
Fixes:
37009008
Test: LoginActivityTest#testAutoFillWhenViewHasChildAccessibilityNodes
Change-Id: Ie694094afe9129b933096a385eb867baf4550e7f
Julia Reynolds [Thu, 6 Apr 2017 16:31:56 +0000 (12:31 -0400)]
Fix build
Test: runtest systemui
Change-Id: I94663b45c8f745c9485cdeb898de5a6bc4f85f0b
Winson Chung [Sat, 25 Mar 2017 00:11:33 +0000 (17:11 -0700)]
Disable PiP when VR mode starts.
Bug:
36214284
Test: Ensure that PiP is stopped when VR is enabled.
Change-Id: Ib537e1f360be7b47199d230e5691f6fece0f925f
Ruben Brunk [Fri, 31 Mar 2017 01:01:33 +0000 (18:01 -0700)]
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
TreeHugger Robot [Thu, 6 Apr 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Bind with the correct action" into oc-dev
Steven Moreland [Thu, 6 Apr 2017 16:28:32 +0000 (09:28 -0700)]
Use hwservicemanager getTransport.
libhidl no longer provides a getTransport function. Now, call into the
hwservicemanager which directly interfaces with libvintf.
Test: extensive, see Ia5d1eb41b057ab5d6800f6c3fd22658adecc4be7
Bug:
36377072
Change-Id: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
Julia Reynolds [Thu, 6 Apr 2017 16:06:09 +0000 (16:06 +0000)]
Merge "Show a link to app settings in notification guts." into oc-dev
am:
0ff1b458ac
Change-Id: I27b70e04b9924c95dbd2f915d27c0e346f2f0a09
Calin Juravle [Thu, 6 Apr 2017 16:03:41 +0000 (16:03 +0000)]
Merge "Keep track of protected data dirs in DexManager" into oc-dev
am:
539128f6d6
Change-Id: I8eb1a7e5300fff4861387a82ce9d47afb1764946
Julia Reynolds [Thu, 6 Apr 2017 15:55:25 +0000 (15:55 +0000)]
Merge "Show a link to app settings in notification guts." into oc-dev
Calin Juravle [Thu, 6 Apr 2017 15:54:58 +0000 (15:54 +0000)]
Merge "Keep track of protected data dirs in DexManager" into oc-dev
Colin Cross [Thu, 6 Apr 2017 15:53:37 +0000 (15:53 +0000)]
Merge "Update layoutlib to match java library changes" am:
ac6414524c am:
72ae1a8958
am:
a989576027
Change-Id: Ib1317327abce727809750ff9a82882e27ce24c66
Colin Cross [Thu, 6 Apr 2017 15:46:30 +0000 (15:46 +0000)]
Merge "Update layoutlib to match java library changes" am:
ac6414524c
am:
72ae1a8958
Change-Id: I729b6f1c3e8d35ee7710f7d34c1e2563a5a198c3