OSDN Git Service
Svetoslav Ganov [Mon, 13 Jun 2016 20:03:40 +0000 (20:03 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
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
Mark Renouf [Mon, 13 Jun 2016 19:36:03 +0000 (19:36 +0000)]
Merge "Set hintTextColor and composingSpan style for EditText and extract view" into nyc-mr1-dev
Mark Renouf [Mon, 13 Jun 2016 15:21:32 +0000 (11:21 -0400)]
Set hintTextColor and composingSpan style for EditText and extract view
BUG: 339521
BUG: 339542
Change-Id: I4bcaf1f237cd32cdc683c4d9620c7d63134e7c6e
ggfan [Mon, 13 Jun 2016 18:31:01 +0000 (18:31 +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: Ie29b9ca18f5ff4039aade7f07b4c59a3b25d7263
Jason Monk [Mon, 13 Jun 2016 18:30:58 +0000 (18:30 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: Ia562b52fff2f6efa4355b9d6ffe8af67fd845b98
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 18:06:24 +0000 (18:06 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I1407a9a6c239d6e2d415c7e53581d4d3eb0db8fa
David Gross [Mon, 13 Jun 2016 17:58:30 +0000 (17:58 +0000)]
Merge "Delete simple reduction implementation." into nyc-dev
Brad Ebinger [Mon, 13 Jun 2016 17:39:18 +0000 (17:39 +0000)]
Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev
Winson [Mon, 13 Jun 2016 17:30:33 +0000 (17:30 +0000)]
Prevent trimming recent tasks belonging in different stacks.
am:
29dbc3cc47
Change-Id: I5f87f2c865a0c5f5dad06bda895f5dd4a780d829
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
TreeHugger Robot [Mon, 13 Jun 2016 16:52:17 +0000 (16:52 +0000)]
Merge "Otadexopt: Expose progress percentage" into nyc-mr1-dev
Jason Monk [Mon, 13 Jun 2016 16:43:47 +0000 (12:43 -0400)]
Fix QS edit view accessibility classes
Change-Id: I6aecd900ac6123e3499ab65db8896d51b70e2f89
Fixes:
29126464
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev
Makoto Onuki [Mon, 13 Jun 2016 16:28:31 +0000 (16:28 +0000)]
Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev
Ricky Wai [Mon, 13 Jun 2016 14:36:45 +0000 (15:36 +0100)]
resolve merge conflicts of
6f1ed20 to nyc-mr1-dev
Change-Id: I9fe1e50f99382cbd8cd90f77ef99d081b472bb81
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:42 +0000 (12:34 +0000)]
Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev
am:
becebcbc6d
Change-Id: I45b9a03ad01c1f29c676d12192c57d2f249d7fea
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:36 +0000 (01:38 +0000)]
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am:
82f2df6108
Change-Id: Ic6def2b3eb5e654b028d11773a9527f01943289d
Robert Carr [Sat, 11 Jun 2016 01:35:43 +0000 (01:35 +0000)]
Merge \"Restore setCropInTransaction HiddenForCrop behavior.\" into nyc-dev
am:
938a70142e
Change-Id: If643cd8c6c4ea1dc9efbf14db8467bd2b4976c06
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: Icd77a15f4debe870342976ebbf2edc5544039f38
TreeHugger Robot [Sat, 11 Jun 2016 00:51:47 +0000 (00:51 +0000)]
Merge "Place a black layer behind SurfaceView." into nyc-dev
Kevin Gabayan [Sat, 11 Jun 2016 00:20:41 +0000 (00:20 +0000)]
Merge "Compute AnyMotionDetector angle using atan2. Bug:
29232136" into nyc-mr1-dev
TreeHugger Robot [Sat, 11 Jun 2016 00:06:55 +0000 (00:06 +0000)]
Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev
Tetsutoki Shiozawa [Fri, 10 Jun 2016 23:20:50 +0000 (23:20 +0000)]
Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev
am:
d25c718a12
Change-Id: I93d2a6fe287491b957e2851de2ead9d878702e63
TreeHugger Robot [Fri, 10 Jun 2016 23:13:51 +0000 (23:13 +0000)]
Merge "Solve the infinite loop on clearExternalStorageDataSync" into nyc-dev
Kevin Gabayan [Thu, 9 Jun 2016 22:40:50 +0000 (15:40 -0700)]
Compute AnyMotionDetector angle using atan2.
Bug:
29232136
Change-Id: Ie57d0228eb42246c4ac1d7a01e2782a621b7e78f
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:45 +0000 (22:43 +0000)]
Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am:
e8a442ccd6
Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
Makoto Onuki [Fri, 10 Jun 2016 22:32:26 +0000 (15:32 -0700)]
Fix some exception messages and enhance unit tets
Bug
29275393
Change-Id: Idaa8564d41f86de2a2cbefa4ff3c08b89a3a6dd2
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
Andreas Gampe [Fri, 10 Jun 2016 22:21:39 +0000 (15:21 -0700)]
Otadexopt: Expose progress percentage
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.
Bug:
25612095
Bug:
29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
Felipe Leme [Fri, 10 Jun 2016 21:54:36 +0000 (21:54 +0000)]
Merge \"Fixed check for visible volume.\" into nyc-dev
am:
be0bacda9b
Change-Id: I5b1aa0be01603cfaa09e3dfaa774182f6a62c188
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:22 +0000 (21:39 +0000)]
Merge \"Reduce shell power over user management.\" into nyc-dev
am:
1b4124fc95
Change-Id: Ia54f3ad9a8594e101407db6b52b378ae8bec72a2
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:16 +0000 (21:31 +0000)]
Merge \"Provide default fallback in theme\" into nyc-dev
am:
7c8360980c
Change-Id: I70328da5ce9ae9988cb58f121caf82c44a16fcec
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
TreeHugger Robot [Fri, 10 Jun 2016 21:03:59 +0000 (21:03 +0000)]
Merge "Merge Theme.Micro and Theme.Material." into nyc-mr1-dev
Sid Soundararajan [Fri, 10 Jun 2016 20:42:06 +0000 (20:42 +0000)]
Merge \"Recents TV: Add a check for touch enabled mode for starting dismiss animation\" into nyc-dev
am:
7476aaa058
Change-Id: I832256859deb5ce9a15d8742cb3a9e21b0e98db9
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:25:21 +0000 (20:25 +0000)]
Merge \"Fixed check for volume name.\" into nyc-dev
am:
cbfc6eed32
Change-Id: Ieba9951e1899abca040e1ca456f911dc76412037
TreeHugger Robot [Fri, 10 Jun 2016 20:17:32 +0000 (20:17 +0000)]
Merge "Fixed check for volume name." into nyc-dev
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
Svet Ganov [Fri, 10 Jun 2016 20:02:22 +0000 (20:02 +0000)]
Merge \"Blame only location observers that actually receive updates\" into nyc-dev
am:
4e85376fe1
Change-Id: I058f0c336974a9b485c674189c97d36f13ec3df1
Eino-Ville Talvala [Fri, 10 Jun 2016 20:02:20 +0000 (20:02 +0000)]
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am:
f4de8dd77c
Change-Id: I439643be2fd5699f1a98d8ca15d14167ea3ffde1
Felipe Leme [Fri, 10 Jun 2016 19:56:21 +0000 (19:56 +0000)]
Merge \"Check for valid paths when getVolumeList() returns invisible volumes.\" into nyc-dev
am:
6da2fb61ce
Change-Id: I0f6c6e36c50b56036b43c32680c8abde2db61c7a
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
Michael Kwan [Fri, 10 Jun 2016 02:44:04 +0000 (19:44 -0700)]
Merge Theme.Micro and Theme.Material.
Bug:
29248638
Change-Id: I1f6a419de89f89e4a105e244c6495e2df29c120c
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
Robert Greenwalt [Fri, 10 Jun 2016 19:39:25 +0000 (19:39 +0000)]
Merge "Clean up PCO plumbing." into nyc-mr1-dev
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
Michael Kwan [Thu, 9 Jun 2016 18:59:21 +0000 (11:59 -0700)]
Temp fix to split header and position count behaviour for watches.
Bug:
29010414
Bug:
29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
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:57 +0000 (18:02 +0000)]
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am:
e4b1fb94e3
Change-Id: I488da6f9f779ddf64beb6ac12d1481d2bfd69821
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:37 +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: Ib7479599ba70cf05dec9b323d62149670612abaa
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:23:25 +0000 (17:23 +0000)]
Merge \"Collect statistics of source build version\" into nyc-dev
am:
8872a604b9
Change-Id: Ic920aced4f17c31a09bea55480f92252f20d728d
Chong Zhang [Fri, 10 Jun 2016 17:18:53 +0000 (17:18 +0000)]
Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am:
792918e5fd
Change-Id: I8ccb08fe3aa9c00b715078086b233a55a338eb94
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:44 +0000 (16:08 +0000)]
Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am:
4bcf66030d
Change-Id: If578de7d7ea10cceb0e19eb68e305432e4177d04
TreeHugger Robot [Fri, 10 Jun 2016 16:03:20 +0000 (16:03 +0000)]
Merge "Fix framebuffer incomplete errors" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 16:00:40 +0000 (16:00 +0000)]
Merge "fix prefix generation" into nyc-mr1-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:54 +0000 (02:21 +0000)]
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am:
094c40b2cc
Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
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:03 +0000 (01:05 +0000)]
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am:
d75bc225ac
Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89
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:44 +0000 (00:16 +0000)]
Merge \"Stop magnifying surface insets.\" into nyc-dev
am:
4663b4e806
Change-Id: Id98ea0c13c325d79e5c2ae88184351e75ad7db46
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
Tao Bao [Thu, 2 Jun 2016 15:47:56 +0000 (08:47 -0700)]
Add RecoverySystem.rebootWipeAb() system API.
It reboots into recovery and securely wipes an A/B device.
Bug:
27253717
Bug:
29159185
Change-Id: I8252894db5c1df48bc4a8728b7f0e0f18aebc44c
TreeHugger Robot [Thu, 9 Jun 2016 23:53:54 +0000 (23:53 +0000)]
Merge "Fix race conditions between Tethering and TetherInterfaceStateMachine" into nyc-mr1-dev
Christopher Tate [Thu, 9 Jun 2016 23:48:44 +0000 (23:48 +0000)]
Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am:
9faaf5418a
Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76
Phil Weaver [Thu, 9 Jun 2016 23:41:45 +0000 (23:41 +0000)]
Merge \"Improve accessibility window title behavior\" into nyc-dev
am:
f8af34365c
Change-Id: I620cb3dc270a8ad409ec1760cedd778821fd8d98
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
TreeHugger Robot [Thu, 9 Jun 2016 23:35:01 +0000 (23:35 +0000)]
Merge "Ephemeral changes for debug builds" into nyc-mr1-dev
Chris Tate [Thu, 9 Jun 2016 23:34:22 +0000 (23:34 +0000)]
Merge "Don't allow restore sessions during backups" into nyc-dev