Commit Graph

74630 Commits

Author SHA1 Message Date
Jesse Hall
b02a9c862a Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev
am: d1736cb2a7

Change-Id: Icaf237e5be3bbd0273a3119e86e995e478fa8576
2017-08-25 01:58:42 +00:00
TreeHugger Robot
d1736cb2a7 Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev 2017-08-25 01:50:38 +00:00
Fyodor Kupolov
b68c260a73 Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
am: f0b56a65f6

Change-Id: I00d9a4ab6f3ab7929c3f8b397329200b8983e672
2017-08-24 23:46:59 +00:00
Fyodor Kupolov
f0b56a65f6 Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev 2017-08-24 23:27:37 +00:00
Jack He
bcdfca9030 Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199
am: 24ad4cfc48

Change-Id: I25df75f9cee3ebe0471fa7f9b3375d849ee31339
2017-08-24 22:10:22 +00:00
Jack He
8ae5462199 Merge changes from topic "bt-fix-checkstyle-errors"
am: 838ab94a0f

Change-Id: I4e619cb17582a6cc954814654820cd945f66e1cc
2017-08-24 21:43:08 +00:00
Yohei Yukawa
b737076a4e Merge "New haptic feedback constants" into oc-mr1-dev
am: f3b78305ff

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
2017-08-24 21:14:36 +00:00
TreeHugger Robot
f3b78305ff Merge "New haptic feedback constants" into oc-mr1-dev 2017-08-24 21:02:57 +00:00
Siyamed Sinir
5186589eba Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
am: faba49c4d3

Change-Id: I2140b3ece38c8081de1b10ae5dbfa32ccf3acf90
2017-08-24 20:39:27 +00:00
Andrii Kulian
a64529a989 Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
am: 7ee92d5291

Change-Id: I8bfb1fb9f96489d9d11cc1b587d78b6a08a130ed
2017-08-24 20:14:28 +00:00
Siyamed Sinir
faba49c4d3 Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
* changes:
  StaticLayout capped height should be 0 when maxLines=0
  Reset StaticLayout.mEllipsized during generate()
2017-08-24 19:59:22 +00:00
Andrii Kulian
7ee92d5291 Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev 2017-08-24 19:59:08 +00:00
Etan Cohen
58d610c5c2 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
am: 19f12028b7

Change-Id: I2a99242470c37ca423221ff31e2fdd72ea53d4f1
2017-08-24 19:54:06 +00:00
TreeHugger Robot
19f12028b7 Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev 2017-08-24 19:29:02 +00:00
Jack He
2992cd084c Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
  - "final private var" -> "private final var"
  - "&&", "+", "||" should not be at the end of line
  - Non-static private variable should be like "mVar"
  - Private static variable should be like "sVar"
  - Code file should always end with newline
  - Inherited methods should be annotated with @Override
    and no @hide tags
  - Public methods should always have a JavaDoc entry
  - "int[] array" is preferred over "int array[]"
  - private methods should be accessed without "this."
    when there is no name collisions.
  - "boolean ? true : false" -> boolean
  - "boolean ? false : true" -> !boolean
  - "boolean == true" OR "boolean != false" -> boolean
  - "boolean != true" OR "boolean == false" -> !boolean

Bug: 63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
2017-08-24 19:09:58 +00:00
Jack He
a355e5efaf Fix checkstyle errors (1/2)
* Automatic style corrections through IDE

Bug: 63596319
Test: make checkbuild, no manual changes, no functional changes
Change-Id: I2397d55abc34c9b7a9b748bec6137778df3421a7
2017-08-24 19:09:48 +00:00
Yohei Yukawa
262dadf870 New haptic feedback constants
This CL introduces several haptic feedback constants that are ready
to be exposed to developers.

Test: checkbuild
Fixes: 64537070
Change-Id: If54d5bc6cab4e2c405615b7a40648c74a1097ea3
2017-08-24 10:51:00 -07:00
Jesse Hall
54fc609183 Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation
Now that VK_KHR_variable_pointers is public, the documentation can be more
precise about the definition of FEATURE_VULKAN_HARDWARE_COMPUTE level 0.
Also document the maxPerStageDescriptorStorageBuffers requirement.

Bug: 34745152
Test: make docs
Change-Id: I0f6c088488243e4daea589d4771d10a8714f7441
2017-08-24 10:23:27 -07:00
Chris Thornton
edb86c3933 Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
am: 0a14929b77

Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a
2017-08-24 16:20:08 +00:00
TreeHugger Robot
0a14929b77 Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev 2017-08-24 16:08:21 +00:00
Etan Cohen
896c574bde [CS] Allow network factory implementations to re-evaluate requests
Change the evalRequests() API to protected to allow network factory
implementations to call the API.

A use-case of the API change is for factories temporarily reject a
request since they cannot fullfill it immediately but retry it at a
later time if/when conditions change.

Bug: 63866251
Test: integration tests
Change-Id: Idc50ce0799c67634b7b2fdbad78a26e443caf2e4
2017-08-24 06:47:55 -07:00
Jorim Jaggi
2b99571564 Merge "Sleep activities with AOD" into oc-mr1-dev
am: f1ef6ef742

Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11
2017-08-24 13:26:16 +00:00
Jorim Jaggi
f1ef6ef742 Merge "Sleep activities with AOD" into oc-mr1-dev 2017-08-24 13:19:42 +00:00
Alexandru-Andrei Rotaru
83f6c7f7a6 Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am: afe28cdf7e

Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09
2017-08-24 10:17:37 +00:00
TreeHugger Robot
afe28cdf7e Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev 2017-08-24 10:08:15 +00:00
Winson Chung
82ff58e40e Merge "Move PiP state check exception to the client side" into oc-mr1-dev
am: 3a02835a02

Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c
2017-08-24 05:12:43 +00:00
TreeHugger Robot
3a02835a02 Merge "Move PiP state check exception to the client side" into oc-mr1-dev 2017-08-24 05:00:48 +00:00
Nate Fischer
da6710a9fe Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
am: bc99692f02

Change-Id: I515ab33e8a306c4f8c0cd64d0bc3d8269d0c1904
2017-08-23 23:56:56 +00:00
TreeHugger Robot
bc99692f02 Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev 2017-08-23 23:41:56 +00:00
Fyodor Kupolov
2c7e249b84 Keep close_idle_connections optimization for all devices
Internal compatibility testing didn't reveal any issues related to it.

Rationale to not make it specific to low-ram:
1) Consistent behavior from app perspective. close_idle_connections
   is a behavioural change and may affect apps relying on undocumented
   behavior of connection pooling. Developers can detect problems
   without testing on low-ram device
2) Closing idle connections is especially important in WAL mode.
   Disabling this feature would become an issue if more apps are
   switching to WAL and we would need to re-enable this optimization.

Test: n/a
Bug: 63398887
Change-Id: I1b431f44daa2d337aad7f12f8e1409ae3143ded0
2017-08-23 16:36:15 -07:00
Svetoslav Ganov
58d7ef66c5 Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
am: ee580764ad

Change-Id: Ie766ecd41d2ac07dd3608fa4ed69edc3c575058f
2017-08-23 23:21:18 +00:00
TreeHugger Robot
ee580764ad Merge "Use all certs for computing package signing sha256" into oc-mr1-dev 2017-08-23 22:51:41 +00:00
Andrii Kulian
732a90a794 Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD
Applied review comments but keeping the flag hidden for now.

Bug: 36555156
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testShowWhenLockedPublicVirtualDisplay
Change-Id: I1aa1289424d0d778bc0668c9ec69bc56f47891e3
2017-08-23 15:42:16 -07:00
Winson Chung
298f95b1ad Move PiP state check exception to the client side
- When calling enterPictureInPictureMode(), the state of the activity in
  the client may be out of sync with the state of the activity in the
  system, causing an exception to be thrown erroneously. Instead, fail
  silently in the system if this occurs, and throw the exception in the
  client when it attempts to enter PiP from an invalid state.

Bug: 63753007
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia99cc086805edc31f997d4325f7a5ccd7c85a77e
2017-08-23 15:06:32 -07:00
George Mount
2d3e8b8ddb Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
am: 230e025841

Change-Id: I8dbb21476f7d38a37c8e5b5732b51255b0bcba14
2017-08-23 21:03:46 +00:00
George Mount
230e025841 Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev 2017-08-23 20:52:34 +00:00
George Mount
3f81c33a35 Use hardware bitmap for shared element snapshots.
Bug: 64851247

Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.

Also fixed broken TransitionTest discovered while
testing.

Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf
2017-08-23 20:51:13 +00:00
Svetoslav Ganov
cdd685c075 Use all certs for computing package signing sha256
In several places we compute the sha256 of the app's signing certificate
(instant cookie storage, backup account permission grants, static shared
lib matching). It is possible that an app is singed with multiple certs
which unfortunately can appear in a random order. We were using only the
first certificate to compute the hash which may be problematic for apps
signed with multiple certs which are later reordered. If an app update's
certs are reordered for cookie storage the app would not be able to
access the cookie, for account grants the app would not get the grant,
and for shared libs the app would fail to install due to a missing lib.

Test: all cookie CTS tests pass
      all static shared lib CTS tests pass
      added test that cookie data not lost on sha256 computation change
      added test that lib install works when specifying
      multiple certs

bug:64270295

Change-Id: Ib6b55f25da735ff5c2762faf6e9b5888e749041d
2017-08-23 11:47:27 -07:00
Andrii Kulian
0111667c9a Merge "Track app visibility updates on the client" into oc-mr1-dev
am: 0d008e3204

Change-Id: Iaa4ef63044a5e20b5886b47a33380c33d2668442
2017-08-23 18:24:20 +00:00
Andrii Kulian
0d008e3204 Merge "Track app visibility updates on the client" into oc-mr1-dev 2017-08-23 18:06:50 +00:00
Nate Fischer
02e281a13d WebView: clarify docs for addJavascriptInterface
Docs change only, no change in logic.

We do not support calling #addJavascriptInterface until after JavaScript
is enabled via WebSettings#setJavaScriptEnabled. Calling these methods
in the wrong order is undefined behavior (and we've seen that it's buggy
under certain conditions, e.g. if the DOM includes an <img> element).

This clarifies the point in the docs and code example.

Bug: 64899039
Test: make -j40 docs (everything looks good)
Change-Id: I8ef9eec7f038037e6b898286e4dad8a57ecad472
(cherry picked from commit aaef6827ca)
2017-08-23 17:49:46 +00:00
Selim Cinek
0c8a132ea3 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
2017-08-23 16:07:49 +00:00
Jorim Jaggi
f12ec0fb64 Sleep activities with AOD
Previously in the last release we started sleeping as soon as
the device was not interactive anymore. However, this caused
issues with ambiactive activites on Android Wear.

Instead, we introduce a new private flag on a window that signals
that all activities should be put to sleep. We use this flag in
SystemUI as soon as SystemUI is "dozing", which means its ambient
display is showing. This flag gets set before we request PWM to
wake-up, so it's ensured that this will not cause any spurious
lifecycle events.

Test: go/wm-smoke
Test: android.server.cts.KeyguardTests
Change-Id: I20f6dd4bfde220f945ef94d2ac1b89dd3694de32
Fixes: 64940094
2017-08-23 16:24:07 +02:00
Alexandru-Andrei Rotaru
b7a79b47cb StringParceledListSlice throws exception when the IPC memory threshold is exceeded
Fixed the code such that list of strings that exceed the 256KB limit can
be transfered.
Bug: 64833731
Test: Added unit test in ParceledListSliceTest

Change-Id: I4e16708010125a444baa8fcb0af6101dc643cd38
(cherry picked from commit 2682fa7067)
2017-08-23 10:07:28 +00:00
Selim Cinek
09adc8f1a3 Merge "Fixed a bug with app provided media spans" into oc-mr1-dev
am: 3c47a11598

Change-Id: I874b39c9c76b13579f94b047a269e47602bda72d
2017-08-23 04:10:55 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Todd Kennedy
d10454ecc3 Merge "Only log resolution when starting activities" into oc-mr1-dev
am: e4de49140d

Change-Id: Ia86f2d6097877e894fed40f12c5c49f26a1b690d
2017-08-23 00:06:45 +00:00
Svet Ganov
a80370745b Merge "Allow clearing instant app meta-data" into oc-mr1-dev
am: e391175330

Change-Id: I35fea7acf6bd4084b06cb17c580c75df08ef484c
2017-08-22 23:39:07 +00:00
Selim Cinek
48f66b7b77 Fixed a bug with app provided media spans
Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.

Test: use media notification with color span, observe no span
Fixes: 64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3
2017-08-22 23:24:38 +00:00
Selim Cinek
a7ea41c7d7 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
am: 9d41e8cd47

Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0
2017-08-22 23:20:24 +00:00