Commit Graph

65218 Commits

Author SHA1 Message Date
Yorke Lee
71ab239765 Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am: cdc9d7bed9

Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
2016-06-13 22:14:24 +00:00
Svetoslav Ganov
5d411eb81a Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am: d054f4f2fe

Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
2016-06-13 22:14:09 +00:00
TreeHugger Robot
cdc9d7bed9 Merge "Check for detached view in drag-related APIs" into nyc-dev 2016-06-13 20:09:43 +00:00
Ruben Brunk
d054f4f2fe Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev 2016-06-13 19:58:31 +00:00
Yorke Lee
07452c37ab Check for detached view in drag-related APIs
Bug: 29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
2016-06-13 11:32:23 -07:00
Andrii Kulian
6e6b0ce1a6 Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: I80f1aa56145ea12001942c57161305b3fcdcc226
2016-06-11 01:38:37 +00:00
TreeHugger Robot
82f2df6108 Merge "Reinflate primary action mode view after detach" into nyc-dev 2016-06-11 01:31:15 +00:00
Andrii Kulian
8d6ac26504 Reinflate primary action mode view after detach
When app is resized in multi-window mode we preserve the window along
with the decor view. If action mode view was shown before such config
change, its view is detached, but the mPrimaryActionModeView variable
is not cleared. So when action mode view is shown again after that it
thinks that its view is still alive.
This CL adds additional check to inflate new mPrimaryActionModeView
if it is not attached to any window.

Bug: 28971666
Change-Id: Ia8c24d4322be32e8b2c8967301beb3a4d889d501
2016-06-10 16:07:43 -07:00
Adam Lesinski
643fc8341a Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019
2016-06-10 22:43:49 +00:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Svetoslav Ganov
e33f613190 Fix permissions update for VrListenerService on user changes.
- Fixes a bug where we would not update the
overlay restrictions if the VR listener we are bound to
changes bug the VR enabled state doesn't.
- Also fixed a case where the notification listener access
and location permission were not granted/revoked for the
correct user. For example, if a vr activity in one user calls
a VR activity in another (possible for cross profiles) we end
up not revoking the special access for the vr service in the
first user. The notification listener setting was also updated
for the system user instead of the user for which we grant/revoke
specal access.
- Properly remove the overlay restrictions for the old user
if we transition from a vr actiivty in one user to a vr activity
in a profile of this user.

Bug: 29273985
Change-Id: Ib1de6f2f5445001ac61edca5c77ea3a066544307
2016-06-10 14:05:51 -07:00
Eino-Ville Talvala
932fe93df7 Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am: f4de8dd77c

Change-Id: I4cc7b4855573e8e5817c5166b5d0f6cdf3d3a4a8
2016-06-10 20:13:53 +00:00
Eino-Ville Talvala
f4de8dd77c Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
* changes:
  Camera2: Fix error codes for CameraDevice.StateCallback.onError()
  Camera2: Protect MarshalRegistry against concurrent access
2016-06-10 19:44:04 +00:00
John Reck
93ff5124c6 Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am: e4b1fb94e3

Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
2016-06-10 18:02:20 +00:00
John Reck
e4b1fb94e3 Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev 2016-06-10 17:46:54 +00:00
Eino-Ville Talvala
50eebe057b Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.

They do not.

Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.

Bug: 29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
2016-06-10 10:28:34 -07:00
Eino-Ville Talvala
4a2c7c5549 Camera2: Protect MarshalRegistry against concurrent access
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.

This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.

Bug: 29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
2016-06-10 10:28:34 -07:00
Tianjie Xu
3287c5f380 Merge \"Collect statistics of source build version\" into nyc-dev
am: 8872a604b9

Change-Id: I42ceaa3033182e833afbb9d10c65f0d57a8f8591
2016-06-10 17:19:32 +00:00
Tianjie Xu
8872a604b9 Merge "Collect statistics of source build version" into nyc-dev 2016-06-10 17:13:54 +00:00
Adam Lesinski
ae903e100f Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
21b6b2a2d1 Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am: d75bc225ac

Change-Id: I7341bb190830bead47af780e22d8ed9ee8819384
2016-06-10 01:05:08 +00:00
Adam Lesinski
d75bc225ac Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev 2016-06-10 00:53:44 +00:00
Adam Lesinski
b55d741c9a BatteryStats: Bump checkin format version to 18
Bug:28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
2016-06-09 17:46:19 -07:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
e2b3248823 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
2016-06-09 23:42:47 +00:00
Phil Weaver
f8af34365c Merge "Improve accessibility window title behavior" into nyc-dev 2016-06-09 23:32:10 +00:00
John Reck
208c47cfb0 Don't call surfaceCreated for just changed surfaces
Fixes: 29223302

If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.

Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
2016-06-09 16:26:21 -07:00
Tianjie Xu
c1ff246f1a Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/1121141

Bug: 28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
2016-06-09 16:00:11 -07:00
Dianne Hackborn
6d8e471072 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
2016-06-09 22:22:00 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Christopher Tate
4676cc96ac Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Adam Lesinski
cdca6fe8a6 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
2016-06-09 21:24:09 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
fb310f6a2f Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I7f1b3f03d9e18fbfa732f2a96242f5f5966828ea
2016-06-09 21:05:23 +00:00
TreeHugger Robot
7a37f8945f Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev 2016-06-09 20:57:53 +00:00
Christopher Tate
36cb2a7a91 Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.

Bug 29220492

Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
2016-06-09 13:47:19 -07:00
Phil Weaver
155edc693e Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.

Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Dianne Hackborn
41bfaf870e Fix more of issue #28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
2016-06-09 12:58:25 -07:00
Adam Lesinski
c1b0ebf579 ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.

Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Robert Carr
5978cf5ff8 Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am: 4624d687f7

Change-Id: I94fc4de5fd24f75b2b69f6380048d8e57ae7980e
2016-06-09 19:36:27 +00:00
Adam Powell
d3c63a66f2 Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.

Bug 28972438

Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
TreeHugger Robot
4624d687f7 Merge "PiP animation: Move window with resize when ending animation." into nyc-dev 2016-06-09 19:28:11 +00:00
Robert Carr
a9408d4a48 PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.

Bug: 28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
2016-06-09 10:31:17 -07:00
Chad Brubaker
303bb79bef Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
2016-06-09 06:27:57 +00:00
TreeHugger Robot
55cf361d83 Merge "Don't depend directly on AppplicationInfo" into nyc-dev 2016-06-09 06:22:20 +00:00
Chad Brubaker
c3a6c78fed Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.

Bug: 29063413

(cherry picked from commit 276ee969be)

Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
2016-06-08 21:48:45 -07:00
Adam Lesinski
30b5e95cbb Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: Iac56b8b134244013730317adf2b417cef402fd09
2016-06-09 03:53:13 +00:00