OSDN Git Service
Makoto Onuki [Mon, 13 Jun 2016 22:17:10 +0000 (22:17 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am:
f419bd9e03
Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
Jason Monk [Mon, 13 Jun 2016 22:17:07 +0000 (22:17 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am:
126366dde5
Change-Id: Iba8b3696738f9fc0260311d49d6e98dfcedbc118
Winson [Mon, 13 Jun 2016 22:17:04 +0000 (22:17 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am:
c169a9d8a1
Change-Id: I16e8679a30285ca9c1472022348861b759e1aed7
Bert McMeen [Mon, 13 Jun 2016 22:17:00 +0000 (22:17 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63
am:
51487f06f9
Change-Id: I4c0c094dda9ce0313c10c78438252e6174c48bc8
Doris Liu [Mon, 13 Jun 2016 22:16:57 +0000 (22:16 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am:
42d39300cf
Change-Id: Ia7bf744345494bbd13a742f33cb63acbe0ab3315
Yorke Lee [Mon, 13 Jun 2016 22:14:24 +0000 (22:14 +0000)]
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am:
cdc9d7bed9
Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
Svetoslav Ganov [Mon, 13 Jun 2016 22:14:09 +0000 (22:14 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
ggfan [Mon, 13 Jun 2016 22:13:57 +0000 (22:13 +0000)]
Merge \"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\" into nyc-dev
am:
da66010cd8
Change-Id: I918352c3b56e03e9fd5f9cf2696ce363668fbeeb
Jason Monk [Mon, 13 Jun 2016 22:13:43 +0000 (22:13 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: I6d4bdd6814951584256d9994d5f88bcafac5edc5
David Gross [Mon, 13 Jun 2016 22:12:48 +0000 (22:12 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
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
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
Winson [Mon, 13 Jun 2016 17:30:52 +0000 (17:30 +0000)]
Prevent trimming recent tasks belonging in different stacks.
am:
29dbc3cc47
Change-Id: Iae15714c3bbca6cdb7fc52191c47dd80c47c7b03
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:22:27 +0000 (13:22 +0000)]
Merge \"Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked\" into nyc-dev
am:
6f1ed200b3
Change-Id: Ib9f627511c46a1e23c02e73a008edf264dc01f79
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:34:39 +0000 (12:34 +0000)]
Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev
am:
becebcbc6d
Change-Id: I8882135a4c1f8e385d6cef563f01913350260013
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 01:38:37 +0000 (01:38 +0000)]
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am:
82f2df6108
Change-Id: I80f1aa56145ea12001942c57161305b3fcdcc226
Robert Carr [Sat, 11 Jun 2016 01:36:14 +0000 (01:36 +0000)]
Merge \"Restore setCropInTransaction HiddenForCrop behavior.\" into nyc-dev
am:
938a70142e
Change-Id: Ica7e5c31c1c08f9424b5eb44ab843c3ce2526914
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
Robert Carr [Sat, 11 Jun 2016 01:00:52 +0000 (01:00 +0000)]
Merge \"Place a black layer behind SurfaceView.\" into nyc-dev
am:
0360a900f7
Change-Id: I734c68b8bb9334f5e02dd34c69ac4bf4da0058b6
TreeHugger Robot [Sat, 11 Jun 2016 00:51:47 +0000 (00:51 +0000)]
Merge "Place a black layer behind SurfaceView." into nyc-dev
Tetsutoki Shiozawa [Fri, 10 Jun 2016 23:20:56 +0000 (23:20 +0000)]
Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev
am:
d25c718a12
Change-Id: Ib7f8efc9d74143cedd7ad06aaec7693ca01ae2e7
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
Adam Lesinski [Fri, 10 Jun 2016 22:43:49 +0000 (22:43 +0000)]
Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am:
e8a442ccd6
Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019
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
Felipe Leme [Fri, 10 Jun 2016 21:54:31 +0000 (21:54 +0000)]
Merge \"Fixed check for visible volume.\" into nyc-dev
am:
be0bacda9b
Change-Id: I3802f5025e83826f47d674f6d03e78737d8fe8b3
TreeHugger Robot [Fri, 10 Jun 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Fixed check for visible volume." into nyc-dev
Sudheer Shanka [Fri, 10 Jun 2016 21:39:33 +0000 (21:39 +0000)]
Merge \"Reduce shell power over user management.\" into nyc-dev
am:
1b4124fc95
Change-Id: I5535f68ff670881dfa10bac6b0628d3647be97bd
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
Jorim Jaggi [Fri, 10 Jun 2016 21:31:25 +0000 (21:31 +0000)]
Merge \"Provide default fallback in theme\" into nyc-dev
am:
7c8360980c
Change-Id: I030fa1b17f02ae18628d19691016f09473d71a26
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:41:52 +0000 (20:41 +0000)]
Merge \"Recents TV: Add a check for touch enabled mode for starting dismiss animation\" into nyc-dev
am:
7476aaa058
Change-Id: I26e08019093452b30ceeef0b20f2c06a19312093
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
Felipe Leme [Fri, 10 Jun 2016 20:24:44 +0000 (20:24 +0000)]
Merge \"Fixed check for volume name.\" into nyc-dev
am:
cbfc6eed32
Change-Id: Ifb1baa23784ec68566b468647a31479c46ad1ff4
TreeHugger Robot [Fri, 10 Jun 2016 20:17:32 +0000 (20:17 +0000)]
Merge "Fixed check for volume name." into nyc-dev
Svet Ganov [Fri, 10 Jun 2016 20:13:57 +0000 (20:13 +0000)]
Merge \"Blame only location observers that actually receive updates\" into nyc-dev
am:
4e85376fe1
Change-Id: I875a1c2764db6ceee5a71830395ffc36ae4f1dd5
Eino-Ville Talvala [Fri, 10 Jun 2016 20:13:53 +0000 (20:13 +0000)]
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am:
f4de8dd77c
Change-Id: I4cc7b4855573e8e5817c5166b5d0f6cdf3d3a4a8
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
Felipe Leme [Fri, 10 Jun 2016 19:58:44 +0000 (19:58 +0000)]
Merge \"Check for valid paths when getVolumeList() returns invisible volumes.\" into nyc-dev
am:
6da2fb61ce
Change-Id: I57e257307eb854d04f298eeefc8a55b55ee6ea78
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
John Reck [Fri, 10 Jun 2016 18:02:20 +0000 (18:02 +0000)]
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am:
e4b1fb94e3
Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
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
Dianne Hackborn [Fri, 10 Jun 2016 17:49:59 +0000 (17:49 +0000)]
Merge \"Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format\" into nyc-dev
am:
9303ecb317
Change-Id: Ibbb8301975226ada197b2bf07970108a2faac005
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:19:32 +0000 (17:19 +0000)]
Merge \"Collect statistics of source build version\" into nyc-dev
am:
8872a604b9
Change-Id: I42ceaa3033182e833afbb9d10c65f0d57a8f8591
Chong Zhang [Fri, 10 Jun 2016 17:19:29 +0000 (17:19 +0000)]
Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am:
792918e5fd
Change-Id: I4b004cee7f0cdf5ccf2f269e0b0aef8de2eb8741
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
Chris Craik [Fri, 10 Jun 2016 16:08:38 +0000 (16:08 +0000)]
Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am:
4bcf66030d
Change-Id: I478d99bc0b1f1f10fef38505282711e95b7f5a09
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
Adam Lesinski [Fri, 10 Jun 2016 02:21:50 +0000 (02:21 +0000)]
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am:
094c40b2cc
Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
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 01:05:08 +0000 (01:05 +0000)]
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am:
d75bc225ac
Change-Id: I7341bb190830bead47af780e22d8ed9ee8819384
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:16:36 +0000 (00:16 +0000)]
Merge \"Stop magnifying surface insets.\" into nyc-dev
am:
4663b4e806
Change-Id: I69d56ae38d9445f662ac3564788ad8da382594b6
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
Christopher Tate [Thu, 9 Jun 2016 23:51:02 +0000 (23:51 +0000)]
Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am:
9faaf5418a
Change-Id: I786bc8d21571fbe456d80b38789fd5e141b3182a
Phil Weaver [Thu, 9 Jun 2016 23:42:47 +0000 (23:42 +0000)]
Merge \"Improve accessibility window title behavior\" into nyc-dev
am:
f8af34365c
Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
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