OSDN Git Service
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
TreeHugger Robot [Mon, 13 Jun 2016 18:24:46 +0000 (18:24 +0000)]
Merge "Fix QS edit view accessibility classes" into nyc-dev
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
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
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
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
Svet Ganov [Thu, 9 Jun 2016 22:51:54 +0000 (22:51 +0000)]
Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev
am:
c94872e940
Change-Id: Ie1e3e6f4e112e40983be6e65ad17ee6e8a5acb55
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
TreeHugger Robot [Thu, 9 Jun 2016 22:26:36 +0000 (22:26 +0000)]
Merge "Settings: add logpersist selection (strings)" into nyc-dev-plus-aosp
Dianne Hackborn [Thu, 9 Jun 2016 22:22:00 +0000 (22:22 +0000)]
Merge \"Fix more of issue #
28689719: Runtime restart\" into nyc-dev
am:
4781525399
Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
Dianne Hackborn [Thu, 9 Jun 2016 22:16:26 +0000 (22:16 +0000)]
Merge "Fix more of issue #
28689719: Runtime restart" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 22:13:32 +0000 (22:13 +0000)]
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am:
52e323bd38
Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
Chris Tate [Thu, 9 Jun 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
Mark Salyzyn [Fri, 3 Jun 2016 21:05:05 +0000 (14:05 -0700)]
Settings: add logpersist selection (strings)
(cherry picked from commit
954ed57091a6471f1873c9954fbb16a4f65a25b5)
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug:
28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
Adam Lesinski [Thu, 9 Jun 2016 21:24:09 +0000 (21:24 +0000)]
Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am:
9e9c78f8ce
Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
Pavlin Radoslavov [Thu, 9 Jun 2016 21:19:29 +0000 (21:19 +0000)]
Merge \\"Unlock mBluetoothLock.readLock() instead of double-locking it\\" am:
4467c845c0
am:
2df165b8db
Change-Id: I89b60a4b78ea3221e7a880c558cd6fd591298d76
Pavlin Radoslavov [Thu, 9 Jun 2016 21:16:32 +0000 (21:16 +0000)]
Merge \"Unlock mBluetoothLock.readLock() instead of double-locking it\"
am:
4467c845c0
Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
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 21:10:28 +0000 (21:10 +0000)]
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"
Adam Powell [Thu, 9 Jun 2016 21:05:23 +0000 (21:05 +0000)]
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am:
7a37f8945f
Change-Id: I7f1b3f03d9e18fbfa732f2a96242f5f5966828ea
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:43:28 +0000 (20:43 +0000)]
Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
am:
142fc425c4
Change-Id: I5142e0a5c495933b87399cc0b62f1b881b04330e
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:33:52 +0000 (20:33 +0000)]
Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
am:
1a77efe9ba
Change-Id: I2b8b3f6dca4b545c770e4221f36f651fd9ca8d21
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