Commit Graph

11405 Commits

Author SHA1 Message Date
Wale Ogunwale
cb0e865a9e Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0 am: a96a9f7326
am: 85cf72df18

Change-Id: Ie00c10b118dc9012149c5467864060f5f9a3a41e
2017-06-10 16:18:22 +00:00
Wale Ogunwale
85cf72df18 Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0
am: a96a9f7326

Change-Id: Ic605bd334932fd01a12f7a1776259d1900915307
2017-06-10 16:11:47 +00:00
Wale Ogunwale
a96a9f7326 Merge "Added 'dumpsys activity lastanr'" into oc-dev
am: b32fecd6e0

Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
2017-06-10 16:05:53 +00:00
Wale Ogunwale
b32fecd6e0 Merge "Added 'dumpsys activity lastanr'" into oc-dev 2017-06-10 15:58:14 +00:00
Wale Ogunwale
f1285916c3 Added 'dumpsys activity lastanr'
Allows for dumping the activity state during the last anr. This will
also be included in collected bug reports.

Bug: 38121026
Test: Cause an anr to occur and run 'adb shell dumpsys activity lastanr'
Change-Id: I1e4200f9e5cc16bfab98e5af31fc599cdd54cd11
2017-06-09 17:17:07 -07:00
George Mount
76922bbb97 Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 62a18e12a3
am: 3e9429be6a

Change-Id: Ia5d655f3ce6bb760574bd5abd02115d9284ea395
2017-06-10 00:04:26 +00:00
George Mount
3e9429be6a Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 62a18e12a3

Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a
2017-06-09 23:56:41 +00:00
George Mount
62a18e12a3 Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
2017-06-09 23:49:21 +00:00
George Mount
e5e246ce5c Merge "Add target sdk check for behavior change." into oc-dev 2017-06-09 23:41:47 +00:00
TreeHugger Robot
036f099d95 Merge "Fix SynchronizeOnNonFinalField warning in FragmentManager." 2017-06-08 21:22:16 +00:00
George Mount
d1cfbc506b Add target sdk check for behavior change.
Bug 62188967

A previous change stopped animations on fragment Views before
being removed. This change in behavior caused other problems,
so the behavior must be placed behind a target SDK check.

Test: ran fragment tests, validated on app
Change-Id: I098e9b0f1472d9838abeacba3baaa7581f7a82ad
2017-06-08 14:18:31 -07:00
Felipe Leme
0f66e5f368 Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918
am: 4d579eacec

Change-Id: I5824d83e8a5043766aa062ff023d5ad82be28d28
2017-06-08 06:18:37 +00:00
Felipe Leme
4d579eacec Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918

Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
2017-06-08 06:07:15 +00:00
Andreas Gampe
f037caed37 Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
2017-06-08 05:54:32 +00:00
Felipe Leme
9be8c96918 Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev 2017-06-08 05:21:08 +00:00
TreeHugger Robot
837f1167ca Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp 2017-06-08 01:08:24 +00:00
Aurimas Liutikas
8d5d55af47 Fix SynchronizeOnNonFinalField warning in FragmentManager.
Bug: 62269464
Test: ./gradlew assembleErrorProne
Change-Id: I2246475941ea606466172f4da941fc3b9db72c5b
2017-06-07 14:11:58 -07:00
Julia Reynolds
fec2890cc8 Merge "Revert "Change default for group alert behavior"" into oc-dev am: 6e96251d92
am: 1732aae9e5

Change-Id: If434921580905cc668c9f4d4294124b9d534baa0
2017-06-07 20:28:53 +00:00
Julia Reynolds
1732aae9e5 Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c
2017-06-07 20:21:38 +00:00
Julia Reynolds
f9f6424adb Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
2017-06-07 20:21:26 +00:00
Julia Reynolds
6e96251d92 Merge "Revert "Change default for group alert behavior"" into oc-dev 2017-06-07 20:12:28 +00:00
Andreas Gampe
dc7f65ac64 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 20:08:44 +00:00
Julia Reynolds
2f431e264d Revert "Change default for group alert behavior"
This reverts commit 8f7828ebe7.

Mutes sound on legacy apps that use their summaries to make sound

Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d

Fixes: 62387153
2017-06-07 14:16:05 +00:00
Felipe Leme
2f6fc72efc Overall improvement on Autofill javadocs for autofillable APIs.
Bug: 37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Change-Id: I7eaf0a521c3777baf0dc0002ae814990fd96a14c
2017-06-06 14:33:56 -07:00
Christopher Tate
e5ef67692e Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773
2017-06-06 20:43:28 +00:00
Christopher Tate
169a884f81 Merge "Fix #62350081 - annotate permission requirements" into oc-dev
am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
2017-06-06 20:32:55 +00:00
TreeHugger Robot
42abe82bbb Merge "Fix #62350081 - annotate permission requirements" into oc-dev 2017-06-06 20:18:21 +00:00
Jeff Sharkey
28f6dc9512 Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
2017-06-06 16:17:39 +00:00
Jeff Sharkey
ec68b46bc8 Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
2017-06-06 15:48:24 +00:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Christopher Tate
8d3079f641 Fix #62350081 - annotate permission requirements
The Alarm Manager APIs that allow callers to ascribe wakelock time
to other apps are gated on the UPDATE_DEVICE_STATS permission.
Document this with the appropriate annotation.

Test: N/A
Change-Id: Idf5548089fb7d2235139ae8ba7bf58e7f455eb33
2017-06-05 18:30:05 -07:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
Selim Cinek
4eee2e09cc Merge "Allow inline replying directly from the image" 2017-06-05 18:11:31 +00:00
Winson Chung
e0e3512045 Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev am: c3504d4f33
am: d288ca8d2d

Change-Id: I80aed8fd0d0a8573bd4b6cec7bf8c14878a0935c
2017-06-05 17:19:14 +00:00
Winson Chung
d288ca8d2d Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
am: c3504d4f33

Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e
2017-06-03 20:50:49 +00:00
TreeHugger Robot
c3504d4f33 Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev 2017-06-03 20:41:18 +00:00
Winson Chung
8783e2d136 Merge "Handling cases with a null bitmap." into oc-dev am: 1eddb0cb2e
am: d1a3b24b62

Change-Id: I1f5b291a0a0b4912df5996ff409eef8ec458d937
2017-06-03 01:52:44 +00:00
Winson Chung
d1a3b24b62 Merge "Handling cases with a null bitmap." into oc-dev
am: 1eddb0cb2e

Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d
2017-06-03 01:44:41 +00:00
Selim Cinek
5d6ef8de1e Allow inline replying directly from the image
Test: runtest systemui
Fixes: 35853345
Change-Id: Id942392b8de5b24de6f4f5cf335fd7f28e48d49a
2017-06-02 17:13:03 -07:00
Winson Chung
4d8681ff6a Workaround to ensure that PIP activities have a visible shadow.
- When the window for the activity enters PIP, update the outline provider
  to override the alpha of the shadow (to be opaque) to ensure that is is
  visible.  Only applies to the task root activity.

Bug: 36741700
Test: Launch YT, ensure that there is a shadow when after it enters PIP
Test: go/wm-smoke
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: If089dae84e4916d3d0e7bbeb316215b46e522e05
2017-06-02 16:02:50 -07:00
Winson Chung
f229ae5523 Handling cases with a null bitmap.
- This can happen either if an app creates an ActivityOptions without a
  thumbnail, or if the call to create a hardware bitmap fails for any
  reason. Just ignore the thumbnail for the transition in this case.

Bug: 62296016
Test: Have not been able to reproduce, but this is just a logical change
Change-Id: I30776b651df1f42118fe1d317fa4817261a6e977
2017-06-02 14:34:52 -07:00
Winson Chung
a9861756b5 Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev am: c672cb5ed9
am: 6d9ea8ec97

Change-Id: I9c0768835c6932c3ec4c55a26fdd63b0d5e6bac5
2017-06-02 16:25:07 +00:00
Winson Chung
6d9ea8ec97 Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev
am: c672cb5ed9

Change-Id: I983396208aa1364884f6b90939c04ef58c2f432c
2017-06-02 16:13:20 +00:00
Winson Chung
c672cb5ed9 Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev 2017-06-02 16:04:52 +00:00
Winson Chung
fc3ec4c5e6 Prevent showing voice session when it is already queued to be hidden.
- It is possible for the session to be requested to be hidden before it
  gets the message to be shown and completes showing. This leads to an
  inconsistency where the voice interaction service implementation will be
  in a different state than the system for the session. Instead, we can
  cancel any pending show messages, and also clean up the pending show
  callback list immediately when the session is hidden.
- Also fixing up some error message codes when starting the assistant
  activity.

Bug: 38379130
Test: android.server.cts.ActivityManagerAssistantStackTests
Test: CtsVoiceInteractionTestCases
Test: CtsAlarmClockTestCases
Change-Id: I0d0e9c024367a47bda82d6a29ca89e18b7d69527
2017-06-01 22:58:01 +00:00
Jesse Hall
6e1ac796d5 Merge changes I101e5578,I157b6233
* changes:
  Init EGL only for HW-accelerated Activities
  Refactor graphics environment initialization
2017-06-01 21:17:53 +00:00
Aurimas Liutikas
a530169277 Merge "Merge "Fix TimePickerDialog positive button clicks." into oc-dev am: 87c727a169" into oc-dev-plus-aosp
am: fa69e851d2

Change-Id: I382f86e733eabde1dcf59cd7a96dda28fd33cbdc
2017-06-01 08:20:36 +00:00
Aurimas Liutikas
145b0fa7c2 Merge "Fix TimePickerDialog positive button clicks." into oc-dev
am: 87c727a169

Change-Id: I805b62533328677b4c0b4b5b98ce29eabeab8b4d
2017-06-01 08:10:46 +00:00