OSDN Git Service
Chong Zhang [Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)]
Merge "Prevent crash from null ApplicationInfo after package is removed." into nyc-dev
Chong Zhang [Mon, 13 Jun 2016 21:41:41 +0000 (14:41 -0700)]
Prevent crash from null ApplicationInfo after package is removed.
Bug:
29234926
Change-Id: I8c2fed7c7e862e1f6798d5ed535d1937f9a74c1a
Andrii Kulian [Mon, 13 Jun 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Don't update task to return to type for last task over home" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Add MessagingStyle transitions" into nyc-dev
Adrian Roos [Thu, 2 Jun 2016 00:09:45 +0000 (17:09 -0700)]
Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes:
29043489
Andrew Solovay [Mon, 13 Jun 2016 21:24:19 +0000 (21:24 +0000)]
Merge \\"docs: Corrected method name in multi-window docs\\" into mnc-io-docs am:
0e68b6b5fc
am:
2c0261224a
Change-Id: I52a482a04b5a8789d48a5347c9a5fc63010462b6
Andrew Solovay [Mon, 13 Jun 2016 21:17:09 +0000 (21:17 +0000)]
Merge \"docs: Corrected method name in multi-window docs\" into mnc-io-docs
am:
0e68b6b5fc
Change-Id: I93b8a2788eadbfeac3b2d293e42d2cef0a42eae4
Makoto Onuki [Mon, 13 Jun 2016 21:16:28 +0000 (21:16 +0000)]
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 21:13:35 +0000 (21:13 +0000)]
Merge "Make sure we don't accidentally allow the night mode tile" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 21:12:46 +0000 (21:12 +0000)]
Merge "docs: Corrected method name in multi-window docs" into mnc-io-docs
Winson Chung [Mon, 13 Jun 2016 21:06:37 +0000 (21:06 +0000)]
Merge "Ensuring we don't try and dismiss task views that are already removed." into nyc-dev
Bert McMeen [Mon, 13 Jun 2016 20:36:12 +0000 (20:36 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d
am:
ba86350c63
Change-Id: I505bc79896257c07dbeee8ed60496350f1d2668a
Bert McMeen [Mon, 13 Jun 2016 20:31:28 +0000 (20:31 +0000)]
Docs: Fixed one of the addListener() links
am:
33a1ea297d
Change-Id: Ia54cdf5de78ad7357cab5617753f5bf28ea89487
Doris Liu [Mon, 13 Jun 2016 20:24:44 +0000 (20:24 +0000)]
Merge "Fix setCurrentPlayTime for started but not yet pulsed animations" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 20:09:42 +0000 (20:09 +0000)]
Merge "Check for detached view in drag-related APIs" into nyc-dev
Ruben Brunk [Mon, 13 Jun 2016 19:58:30 +0000 (19:58 +0000)]
Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev
Jason Monk [Mon, 13 Jun 2016 19:39:11 +0000 (15:39 -0400)]
Make sure we don't accidentally allow the night mode tile
Bug:
28887927
Change-Id: I7cf9ae3f0c853d70172b2af3e75cd8d0106afde1
Winson [Mon, 13 Jun 2016 19:14:45 +0000 (12:14 -0700)]
Ensuring we don't try and dismiss task views that are already removed.
Bug:
29240786
Change-Id: I724e7c366b2fb835fd81fa966689f999953ef4c8
Bert McMeen [Fri, 10 Jun 2016 22:50:54 +0000 (15:50 -0700)]
Docs: Fixed one of the addListener() links
Bug:
28454953
Change-Id: I00002c8bba42e972331d5d80193094606243e252
Yorke Lee [Mon, 13 Jun 2016 18:31:03 +0000 (11:31 -0700)]
Check for detached view in drag-related APIs
Bug:
29253539
Change-Id: I26285404ee15bb17e87ac23c67f7c3c6aaa2d968
Gerry Fan [Mon, 13 Jun 2016 18:27:08 +0000 (18:27 +0000)]
Merge "Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo" into nyc-dev
TreeHugger Robot [Mon, 13 Jun 2016 18:24:46 +0000 (18:24 +0000)]
Merge "Fix QS edit view accessibility classes" into nyc-dev
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
use packed layer binaries
punt building layers to Khronos github repo
Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
David Gross [Mon, 13 Jun 2016 17:58:30 +0000 (17:58 +0000)]
Merge "Delete simple reduction implementation." into nyc-dev
Doris Liu [Fri, 10 Jun 2016 21:46:43 +0000 (14:46 -0700)]
Fix setCurrentPlayTime for started but not yet pulsed animations
Also fix the behavior for calling reverse() immediately after
start(). Such case now triggers end() right away, which is
consistent with what the animation would do in M.
Bug:
29271714
Change-Id: I045e36e039179a3c462f22bc6a3a765437de4074
Winson [Wed, 8 Jun 2016 19:49:54 +0000 (12:49 -0700)]
Prevent trimming recent tasks belonging in different stacks.
- When launching an adjacent task, we usually have the same activity
not necessarily launched with MULTIPLE_TASK, so the old recent task
is incorrectly found removed.
Bug:
29121819
Change-Id: Id3bbafe0d3c535fd1a05bb373e521345c18f43d5
Jason Monk [Mon, 13 Jun 2016 16:43:47 +0000 (12:43 -0400)]
Fix QS edit view accessibility classes
Change-Id: I6aecd900ac6123e3499ab65db8896d51b70e2f89
Fixes:
29126464
Ricky Wai [Mon, 13 Jun 2016 13:12:47 +0000 (13:12 +0000)]
Merge "Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked" into nyc-dev
Tony Mak [Mon, 13 Jun 2016 12:22:45 +0000 (12:22 +0000)]
Merge "Use startActivityDismissingKeyguard to show vpn setting page in keyguard" into nyc-dev
Andrii Kulian [Sat, 11 Jun 2016 00:48:52 +0000 (17:48 -0700)]
Don't update task to return to type for last task over home
Resizing docked stack to fullscreen size results in dismissal
of docked stack and moving of tasks to fullscreen stack.
When tasks, which were originally launched from home or recents,
are inserted on top of fullscreen stack, their mTaskToReturnTo
value was overwritten.
This CL doesn't allow to overwrite this field of task if there
is no next task in stack and it was launched from home or recents.
Bug:
29237751
Change-Id: If56cd3f68b6b400c2d5c945431371acfe6269682
TreeHugger Robot [Sat, 11 Jun 2016 01:31:14 +0000 (01:31 +0000)]
Merge "Reinflate primary action mode view after detach" into nyc-dev
TreeHugger Robot [Sat, 11 Jun 2016 01:21:20 +0000 (01:21 +0000)]
Merge "Restore setCropInTransaction HiddenForCrop behavior." into nyc-dev
TreeHugger Robot [Sat, 11 Jun 2016 00:51:47 +0000 (00:51 +0000)]
Merge "Place a black layer behind SurfaceView." into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 23:13:51 +0000 (23:13 +0000)]
Merge "Solve the infinite loop on clearExternalStorageDataSync" into nyc-dev
Andrii Kulian [Wed, 8 Jun 2016 20:14:19 +0000 (13:14 -0700)]
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
Robert Carr [Thu, 9 Jun 2016 17:22:38 +0000 (10:22 -0700)]
Place a black layer behind SurfaceView.
For SurfaceView's which do not implement
SurfaceRedrawNeeded we can see holes through to the
background in various scenarios. We prevent this by
placing a DimLayer behind opaque SurfaceViews. SurfaceFlinger
will remove it from the visible layers when the SurfaceView
totally obscures it.
Bug:
28763785
Change-Id: I9b4d1ba8be786f30432a6a3b42e5616662cdc090
Robert Carr [Fri, 10 Jun 2016 22:13:32 +0000 (15:13 -0700)]
Restore setCropInTransaction HiddenForCrop behavior.
Prior to c/
1106850 setCropInTransaction hid the surface
for crop width and height <= 0. That CL allowed
setting -1 for crop width and height which SF
determines as clearing the crop. Other portions of the code
depend on the old behavior though for negative values, so restore
the behavior of setCropInTransaction and use a new clearCrop
method for the new code.
Bug:
29276588
Change-Id: I728666009c362ff635c7ebfb3ef2e83428fb03fe
Adam Lesinski [Fri, 10 Jun 2016 22:29:14 +0000 (22:29 +0000)]
Merge "BatteryStats: Fix read/write parcel order" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 22:15:08 +0000 (15:15 -0700)]
BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.
Bug:
29264326
Bug:
28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
TreeHugger Robot [Fri, 10 Jun 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Fixed check for visible volume." into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 21:33:27 +0000 (21:33 +0000)]
Merge "Reduce shell power over user management." into nyc-dev
Tetsutoki Shiozawa [Wed, 8 Jun 2016 04:45:47 +0000 (13:45 +0900)]
Solve the infinite loop on clearExternalStorageDataSync
5000 msec timeout is set for waiting DefaultContainerService, but
it's not working. It's not possible to exit a wait loop even if it
takes over 5000 msec.
Bug:
29232999
Change-Id: I74a45637e0a3fa5a7b151e6b3dc0b3aaece96d53
TreeHugger Robot [Fri, 10 Jun 2016 21:20:48 +0000 (21:20 +0000)]
Merge "Provide default fallback in theme" into nyc-dev
Svetoslav Ganov [Wed, 1 Jun 2016 23:25:31 +0000 (16:25 -0700)]
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
Sid Soundararajan [Fri, 10 Jun 2016 20:37:59 +0000 (20:37 +0000)]
Merge "Recents TV: Add a check for touch enabled mode for starting dismiss animation" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 20:17:32 +0000 (20:17 +0000)]
Merge "Fixed check for volume name." into nyc-dev
Andrew Solovay [Fri, 10 Jun 2016 20:17:08 +0000 (13:17 -0700)]
docs: Corrected method name in multi-window docs
Confirmed on nyc-dev, the method name is
Activity.RequestDragAndDropPermissions(), not--as incorrectly
stated--Activity.RequestDropPermissions(). Updating preview docs
accordingly.
See first comment for doc stage location.
bug:
29057218
Change-Id: If147a9a5758abbe8fc46a6b40720e1328c78a095
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Svetoslav Ganov [Fri, 10 Jun 2016 19:55:28 +0000 (19:55 +0000)]
Merge "Blame only location observers that actually receive updates" into nyc-dev
Jorim Jaggi [Fri, 10 Jun 2016 19:45:16 +0000 (12:45 -0700)]
Provide default fallback in theme
This reverts a part of Ifb724b5c5feea3ed70d68e5bd7615fa91185e743:
Since we enforce the background to be non-translucent, this part
can be reverted and only causes unnecessary regressions.
Change-Id: Ide7b60ee05eb275344fee2f4370f0e8461ef2783
Fixes:
29192742
Eino-Ville Talvala [Fri, 10 Jun 2016 19:44:03 +0000 (19:44 +0000)]
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
* changes:
Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Camera2: Protect MarshalRegistry against concurrent access
TreeHugger Robot [Fri, 10 Jun 2016 19:38:49 +0000 (19:38 +0000)]
Merge "Check for valid paths when getVolumeList() returns invisible volumes." into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 18:30:56 +0000 (11:30 -0700)]
Fixed check for visible volume.
Previously it was checked if the volume was visible to user, but
transient volumes (such as USB drives) are not marked as such.
Fixes:
29174953
Change-Id: I5dbcc42c5b31c6856e01f73815d73482822785d9
Felipe Leme [Fri, 10 Jun 2016 18:09:11 +0000 (11:09 -0700)]
Check for valid paths when getVolumeList() returns invisible volumes.
The FLAG_INCLUDE_INVISIBLE was created to let SM.getStorageVolumes()
return mounted volumes (like USB drives), but in the current form it
might return invalid volumes. For example, when a SD Card is adopted as
an internal storage, it will return 2 volumes instead of one, the "bad"
one being:
VolumeInfo{emulated}:
type=EMULATED diskId=null partGuid=null mountFlags=0 mountUserId=-1
state=UNMOUNTED
fsType=null fsUuid=null fsLabel=null
path=null internalPath=null
As such, we need to filter out those volumes that don't have a path.
BUG:
29250241
Change-Id: I3f84b53eac98f31f918d843c70f9d42983e2a438
Felipe Leme [Thu, 9 Jun 2016 22:25:00 +0000 (15:25 -0700)]
Fixed check for volume name.
There are scenarios - like when an SD Card is adopted as internal
storage - where the getBestVolumeDescription() returns null, in which
case we should use the StorageVolume description instead (or a default
value if such description is also null)>
Change-Id: Ia11c3f4069dfbe252c568210ee60b5d8c384d863
Fixes:
29198046
Sid Soundararajan [Thu, 9 Jun 2016 22:40:14 +0000 (15:40 -0700)]
Recents TV: Add a check for touch enabled mode for starting dismiss animation
Fix until we figure out if Gamepad not eating key events during talkback is
inteneded behavior.
BUG:
29208918
Change-Id: Iffe652f10e88d0218875264f31e9d7658d75e71e
John Reck [Fri, 10 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev
Dianne Hackborn [Fri, 10 Jun 2016 17:43:13 +0000 (17:43 +0000)]
Merge "Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format" into nyc-dev
Eino-Ville Talvala [Fri, 10 Jun 2016 00:07:13 +0000 (17:07 -0700)]
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
Eino-Ville Talvala [Thu, 9 Jun 2016 20:08:59 +0000 (13:08 -0700)]
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
Tianjie Xu [Fri, 10 Jun 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Collect statistics of source build version" into nyc-dev
Chong Zhang [Fri, 10 Jun 2016 17:06:08 +0000 (17:06 +0000)]
Merge "Use user id 0 to get missing appId for debugger" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 16:03:20 +0000 (16:03 +0000)]
Merge "Fix framebuffer incomplete errors" into nyc-dev
Svet Ganov [Fri, 10 Jun 2016 07:12:38 +0000 (00:12 -0700)]
Blame only location observers that actually receive updates
The location manager service keeps update records for all apps
registered to receive location updates. If an app does not have
the location permission then its update record is skipped when
dispatching location updates. However, the battery blame is spread
across all apps requesting location updates even if they don't
receive such because of lacking permission.
bug:
28804546
Change-Id: Iee96fd6f304c7a49f9c70484e52abc0ed1538a29
TreeHugger Robot [Fri, 10 Jun 2016 02:12:22 +0000 (02:12 +0000)]
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:53:43 +0000 (00:53 +0000)]
Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:46:19 +0000 (17:46 -0700)]
BatteryStats: Bump checkin format version to 18
Bug:
28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
Adam Lesinski [Wed, 8 Jun 2016 20:55:55 +0000 (13:55 -0700)]
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
Phil Weaver [Fri, 10 Jun 2016 00:08:21 +0000 (00:08 +0000)]
Merge "Stop magnifying surface insets." into nyc-dev
Chris Craik [Thu, 9 Jun 2016 23:57:11 +0000 (16:57 -0700)]
Fix framebuffer incomplete errors
bug:
29127615
Primarily fixes case where 0 dimensioned layers could be
created/updated. Additionally, adds more logging in incomplete
framebuffer cases, if they still occur.
Change-Id: Ib90dbbafd6905aca3c8f46e64064e13a308f713d
Dianne Hackborn [Thu, 9 Jun 2016 23:58:45 +0000 (16:58 -0700)]
Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format
Change-Id: I36d4e5e20ff2ed1b4d02a04390e0415b9b2394a3
Chong Zhang [Thu, 9 Jun 2016 23:15:27 +0000 (16:15 -0700)]
Use user id 0 to get missing appId for debugger
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.
This also revert commit
55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.
bug:
28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
Chris Tate [Thu, 9 Jun 2016 23:34:22 +0000 (23:34 +0000)]
Merge "Don't allow restore sessions during backups" into nyc-dev
Phil Weaver [Thu, 9 Jun 2016 23:32:09 +0000 (23:32 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 23:28:26 +0000 (16:28 -0700)]
Don't allow restore sessions during backups
Gracefully no-op if apps attempt to restore themselves while there is
a backup pass in flight.
Bug
29135379
Change-Id: I8f0b5cd9d149b703e1de7a3a0b4b54c3aff766b6
John Reck [Thu, 9 Jun 2016 23:26:21 +0000 (16:26 -0700)]
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
Tianjie Xu [Wed, 8 Jun 2016 22:02:35 +0000 (15:02 -0700)]
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
Svetoslav Ganov [Thu, 9 Jun 2016 22:44:50 +0000 (22:44 +0000)]
Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev
Dianne Hackborn [Thu, 9 Jun 2016 22:16:26 +0000 (22:16 +0000)]
Merge "Fix more of issue #
28689719: Runtime restart" into nyc-dev
Chris Tate [Thu, 9 Jun 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 21:16:01 +0000 (21:16 +0000)]
Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 20:44:48 +0000 (13:44 -0700)]
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
Phil Weaver [Thu, 9 Jun 2016 17:24:53 +0000 (10:24 -0700)]
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
Philip P. Moltmann [Thu, 9 Jun 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Cache resources needed to sort media sizes." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 20:27:28 +0000 (20:27 +0000)]
Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev
Dianne Hackborn [Wed, 8 Jun 2016 23:33:29 +0000 (16:33 -0700)]
Fix more of issue #
28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
Adam Lesinski [Thu, 9 Jun 2016 18:17:10 +0000 (11:17 -0700)]
ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.
Bug:
27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
Adam Powell [Thu, 9 Jun 2016 19:36:16 +0000 (12:36 -0700)]
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
TreeHugger Robot [Thu, 9 Jun 2016 19:28:10 +0000 (19:28 +0000)]
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
Philip P. Moltmann [Thu, 9 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 00:20:44 +0000 (17:20 -0700)]
Don't update mTaskToReturnTo when task is cleared
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.
Bug:
28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
Eric Schmidt [Thu, 9 Jun 2016 17:56:38 +0000 (17:56 +0000)]
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am:
e4b1149320
am:
2dea7d3836
Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
Eric Schmidt [Thu, 9 Jun 2016 17:45:53 +0000 (17:45 +0000)]
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am:
e4b1149320
Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
Eric Schmidt [Thu, 9 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "docs: Added links to performance resources section" into mnc-io-docs
Tony Mak [Thu, 9 Jun 2016 17:35:37 +0000 (18:35 +0100)]
Use startActivityDismissingKeyguard to show vpn setting page in keyguard
Fix:
29200690
Change-Id: I47ff08ce379b985abf84cd931f7f83e918acc5f8
Robert Carr [Fri, 3 Jun 2016 20:28:48 +0000 (13:28 -0700)]
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
Aurimas Liutikas [Thu, 9 Jun 2016 16:57:02 +0000 (16:57 +0000)]
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am:
396ed8d2cf
am:
6e70538600
Change-Id: I0714693f2f19107d056be72944343c9636a0ff7e
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:58 +0000 (16:56 +0000)]
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am:
f9f7a29fe9
am:
9bd21c0fbb
Change-Id: Ib9c0255b772b0fc47d46758abdace1cf6bc9b045