Commit Graph

313509 Commits

Author SHA1 Message Date
Romain Guy
98e11587f2 Merge "Rename getIntent() to getRenderIntent()" into oc-dev
am: b2bb3bf268

Change-Id: I10652933266e3eb976244de9e7b1ddeab4fe7c87
2017-04-06 21:39:20 +00:00
TreeHugger Robot
b2bb3bf268 Merge "Rename getIntent() to getRenderIntent()" into oc-dev 2017-04-06 21:34:17 +00:00
Romain Guy
3b447f6ed7 Merge changes I6f00614d,I987eeab2 into oc-dev
am: c273784c91

Change-Id: I732b93decc6ce9b3a846c971ff25484447ff9127
2017-04-06 21:30:17 +00:00
TreeHugger Robot
c273784c91 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
2017-04-06 21:21:59 +00:00
Roozbeh Pournader
5ba27c46bb Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
am: 43fed9afe4

Change-Id: I3c077353adf8040118b0610248848fe3d552a70e
2017-04-06 21:20:03 +00:00
Roozbeh Pournader
73da8f95b3 Merge "Force direction of phone number fields to (practically) LTR" into oc-dev
am: 0dc7596ee3

Change-Id: I10ad0deefcc24276c376816e8b7482f64d040023
2017-04-06 21:18:57 +00:00
Felipe Leme
7376cd0cf8 Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev
am: 11d1a392f2

Change-Id: Icd09a38a7ef4942578719574004a11d695a6dc92
2017-04-06 21:17:45 +00:00
Roozbeh Pournader
43fed9afe4 Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev 2017-04-06 21:13:28 +00:00
Roozbeh Pournader
0dc7596ee3 Merge "Force direction of phone number fields to (practically) LTR" into oc-dev 2017-04-06 21:13:05 +00:00
TreeHugger Robot
11d1a392f2 Merge "Shows a Toast when manual autofill request cannot be fulfilled." into oc-dev 2017-04-06 21:06:47 +00:00
Philip P. Moltmann
3b817ad66c Merge "Add RecommendationPlugin for Cloud Print" am: b2c75d062d am: 997f7cbabf
am: 41687d06f4

Change-Id: Iddb64b94c03eaf6925d9b4e161ac3c6fdd25a1b8
2017-04-06 20:49:53 +00:00
Philip P. Moltmann
41687d06f4 Merge "Add RecommendationPlugin for Cloud Print" am: b2c75d062d
am: 997f7cbabf

Change-Id: I2b784f49097426922e833f102e1f28fc4dc99357
2017-04-06 20:42:50 +00:00
Sundeep Ghuman
ca53b1fcfe Merge "Update comment on why Keep is needed." into oc-dev
am: 696a83b0c7

Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef
2017-04-06 20:40:11 +00:00
Kang Li
461959d71f Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am: 5a0ee44ce5

Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
2017-04-06 20:37:09 +00:00
Philip P. Moltmann
997f7cbabf Merge "Add RecommendationPlugin for Cloud Print"
am: b2c75d062d

Change-Id: I4b018ac9763d9bf5c69d055b4a9d5ddf6dded3cb
2017-04-06 20:35:44 +00:00
TreeHugger Robot
696a83b0c7 Merge "Update comment on why Keep is needed." into oc-dev 2017-04-06 20:32:44 +00:00
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
TreeHugger Robot
5a0ee44ce5 Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-06 20:25:47 +00:00
Treehugger Robot
b2c75d062d Merge "Add RecommendationPlugin for Cloud Print" 2017-04-06 20:23:14 +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
Matt Sarett
fd5d5425ee Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev
am: c29dffed16

Change-Id: I5a62876593d2e4423758bce57c8b82e9bdb3864c
2017-04-06 20:16:19 +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
Chad Brubaker
878331631e Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev
am: 6de4ea56f7

Change-Id: Ibdf483d6b40ac30f78e3e6e4a024c7da2354831d
2017-04-06 20:09:06 +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
Felipe Leme
eefb3c91f1 Merge "Fixed Autofill NPE that crashed some apps." into oc-dev
am: 75d0d92f7b

Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2
2017-04-06 20:04:53 +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
c29dffed16 Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev 2017-04-06 19:48:47 +00:00
TreeHugger Robot
e002ce70e3 Merge "Refactor VR state management in ActivityManagerService." into oc-dev 2017-04-06 19:47:33 +00:00
Roozbeh Pournader
380154724b 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
2017-04-06 19:42:57 +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
6de4ea56f7 Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev 2017-04-06 19:40:25 +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
Romain Guy
1cf7b4fcb3 Rename getIntent() to getRenderIntent()
Bug: 37077433
Test: compile and ColorSpaceTests
Change-Id: I8eb1fa6136582eaac1d509ebfef7f67b0fffe1aa
2017-04-06 12:37:03 -07:00
Felipe Leme
75d0d92f7b Merge "Fixed Autofill NPE that crashed some apps." into oc-dev 2017-04-06 19:36:26 +00:00
Romain Guy
89de234c72 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
2017-04-06 12:24:29 -07: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
Junda Liu
b99d392425 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 am: c86e5802c6
am: efb72ba71c

Change-Id: Ib678a10ef5d4792581c40d8ac15a183604d35ba2
2017-04-06 18:39:43 +00:00
Junda Liu
efb72ba71c Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6
am: c86e5802c6

Change-Id: I9ea249ed0837c8501f62154bec5c36d47a0e67e0
2017-04-06 18:32:10 +00:00
Jason Monk
ba53d8ae41 Revert "Handle case when snapshot dimensions don't match"
This reverts commit aea6b74e17.
Bug: 36991071
Bug: 36703868
Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd
2017-04-06 18:30:11 +00:00
Junda Liu
c86e5802c6 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
am: ded8a6b7f6

Change-Id: I12f28266088cd9565d62097477c69dcb5ece54e2
2017-04-06 18:25:10 +00:00
Jason Monk
ab98962251 Merge "Ignore a broken test until it can be fixed." into oc-dev
am: eb93670383

Change-Id: Ie8b63c5dcdf7461a2a5d3baf12c400ec73ea3fb8
2017-04-06 18:24:54 +00:00
Junda Liu
ded8a6b7f6 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." 2017-04-06 18:17:41 +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