OSDN Git Service
Julia Reynolds [Wed, 19 Apr 2017 13:50:18 +0000 (13:50 +0000)]
Merge "Don't clear snoozed components on restore." into oc-dev
am:
f1c7b9e121
Change-Id: I8d899a642d8bbb8b5e180c27198fd1c311f34e91
Julia Reynolds [Wed, 19 Apr 2017 13:44:18 +0000 (13:44 +0000)]
Merge "Don't clear snoozed components on restore." into oc-dev
Philipp Weiß [Wed, 19 Apr 2017 09:33:31 +0000 (09:33 +0000)]
Merge "Redesign of QSSecurityFooter" into oc-dev
am:
a017e573b5
Change-Id: Ie859fee072588a2748810c9f5fc5ec5b2f04b914
Philipp Weiß [Wed, 19 Apr 2017 09:25:38 +0000 (09:25 +0000)]
Merge "Redesign of QSSecurityFooter" into oc-dev
Narayan Kamath [Wed, 19 Apr 2017 08:07:00 +0000 (08:07 +0000)]
Merge "Binder: Log details of pending exception." into oc-dev
am:
dc51eedd1f
Change-Id: Icef6281e4cdb001216fd013d8ccd7fd1cee2d25c
Narayan Kamath [Wed, 19 Apr 2017 08:03:00 +0000 (08:03 +0000)]
Merge "Binder: Log details of pending exception." into oc-dev
Felipe Leme [Wed, 19 Apr 2017 05:13:19 +0000 (05:13 +0000)]
Merge "Some Autofill API changes." into oc-dev
am:
fe1bddfbb5
Change-Id: I682065cd5fcfb2de9639874705fefdeaed06d343
Felipe Leme [Wed, 19 Apr 2017 05:05:44 +0000 (05:05 +0000)]
Merge "Some Autofill API changes." into oc-dev
Lucas Dupin [Wed, 19 Apr 2017 03:24:40 +0000 (03:24 +0000)]
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
am:
9cd92959e6
Change-Id: Ib71474073088c9098652f1f1a792aab615676cd9
TreeHugger Robot [Wed, 19 Apr 2017 03:17:45 +0000 (03:17 +0000)]
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
Svetoslav Ganov [Wed, 19 Apr 2017 02:56:39 +0000 (02:56 +0000)]
Merge "Address API council comments" into oc-dev
am:
57ed0ba69d
Change-Id: I28253a456f288da02506367a2b9039cffb1d0a25
Sunny Goyal [Wed, 19 Apr 2017 02:53:05 +0000 (02:53 +0000)]
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
am:
15b48ff4de
Change-Id: Ifce032deebbe1dd66d4e80dd211030765daab4a0
Philip P. Moltmann [Wed, 19 Apr 2017 02:50:01 +0000 (02:50 +0000)]
Merge "Add a way to read the last AutofillSelection." into oc-dev
am:
42775f2a89
Change-Id: I6be640dc4bf6ceba6889c59a4e464540f3834e6e
Svetoslav Ganov [Wed, 19 Apr 2017 02:44:11 +0000 (02:44 +0000)]
Merge "Address API council comments" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:43:40 +0000 (02:43 +0000)]
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:43:00 +0000 (02:43 +0000)]
Merge "Add a way to read the last AutofillSelection." into oc-dev
Felipe Leme [Wed, 19 Apr 2017 00:48:49 +0000 (17:48 -0700)]
Some Autofill API changes.
- Added View.IMPORTANT_FOR_AUTOFILL_YES_INCLUDE_DESCENDANTS
- Added View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS
- Added FillResponse.Builder.setIgnoredIds()
- Fixed javadoc links.
These changes are not implemented yet....
Bug:
37424141
Bug:
36171235
Test: m update-api
Change-Id: I604960443ab08cd3f2a84a70b0a2cece7cb0a00c
Yu Liu [Wed, 19 Apr 2017 01:41:51 +0000 (01:41 +0000)]
Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG:
36552859" into oc-dev
am:
500c1d0749
Change-Id: I1ca9beace45f80962d3992c27724e6d281972524
Todd Kennedy [Wed, 19 Apr 2017 01:40:36 +0000 (01:40 +0000)]
Merge "update docs per API council" into oc-dev
am:
e28cccab24
Change-Id: I156e1547adab002afee19bacbd13808936a48775
Winson Chung [Wed, 19 Apr 2017 01:34:40 +0000 (01:34 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
am:
982ce6402b
Change-Id: Ic8c30fa320022bfc5233738f13f45bb4b30bb4e3
Yu Liu [Wed, 19 Apr 2017 01:33:04 +0000 (01:33 +0000)]
Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG:
36552859" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:31:41 +0000 (01:31 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:29:10 +0000 (01:29 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
* changes:
Add remaining default media icons.
Disable PiP when a task is locked.
Fix issue with PiP actions flashing.
Nathan Harold [Wed, 19 Apr 2017 00:58:26 +0000 (00:58 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
am:
fca728da6c
Change-Id: I64e9e5076b26562f3faaad8fb1a201d0933e8f50
Chen Xu [Wed, 19 Apr 2017 00:55:11 +0000 (00:55 +0000)]
Merge "better defualt behaviour for msim" into oc-dev
am:
7358ebeedd
Change-Id: Id8fd96ae871c510972f70450224b5ab2e20f27da
Nathan Harold [Wed, 19 Apr 2017 00:52:35 +0000 (00:52 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
am:
01307a7e94 -s ours
Change-Id: Id6b155b29ef23961b4c3303a2f35d1701c9f8478
Nathan Harold [Wed, 19 Apr 2017 00:36:16 +0000 (00:36 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
Chen Xu [Wed, 19 Apr 2017 00:34:52 +0000 (00:34 +0000)]
Merge "better defualt behaviour for msim" into oc-dev
Nathan Harold [Wed, 19 Apr 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
Winson Chung [Wed, 19 Apr 2017 00:29:39 +0000 (00:29 +0000)]
Merge "Update Overview content descriptions." into oc-dev
am:
aede8d6226
Change-Id: I15402dfe79d4bbdd43a95d3fdb7a3b2d7295a3ad
Felipe Leme [Wed, 19 Apr 2017 00:28:27 +0000 (00:28 +0000)]
Merge "Clone autofill service settings on managed profile." into oc-dev
am:
fad9b07e31
Change-Id: I0c65659302047536a2b2b594cdb90e1aa05b4621
Winson Chung [Wed, 19 Apr 2017 00:22:35 +0000 (00:22 +0000)]
Merge "Update Overview content descriptions." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 00:20:05 +0000 (00:20 +0000)]
Merge "Clone autofill service settings on managed profile." into oc-dev
Jaewan Kim [Wed, 19 Apr 2017 00:18:12 +0000 (00:18 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde am:
16e5c08cbd
am:
fcb86793a6 -s ours
Change-Id: Iccbaef08a79790e645b9b520608d215f255ebf9e
Philip P. Moltmann [Mon, 17 Apr 2017 21:18:33 +0000 (14:18 -0700)]
Add a way to read the last AutofillSelection.
- Check UID to make sure one service cannot read FillSelections of other
services
- Add id to Dataset to allow to tag the datasets. This id is then found
in the FillSelection.Event
- Add clientState to FillSelection to allow service to store more data
Fixes:
36871500
Test: CtsAutoFillServiceTestCases
Change-Id: Ice894245508227265294a1c59ea97842175e5aec
Torne (Richard Coles) [Tue, 18 Apr 2017 23:51:57 +0000 (23:51 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev
am:
4396a74208
Change-Id: Ia2253843589ccb740706a8659b962c0da125d097
Svetoslav Ganov [Tue, 18 Apr 2017 21:28:35 +0000 (14:28 -0700)]
Address API council comments
Test: all static shared lib CTS tests pass
bug:
37327970
Change-Id: Ie8c4d853da5fa0a6125b9def38831860f79ce53d
Chris Wren [Tue, 18 Apr 2017 23:43:50 +0000 (23:43 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev
am:
ddf1d16504
Change-Id: Ife617e3f96339a411416f48ab84ea72a992d2b75
TreeHugger Robot [Tue, 18 Apr 2017 23:43:21 +0000 (23:43 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev
Jaewan Kim [Tue, 18 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde
am:
16e5c08cbd
Change-Id: Ie38c7ea468285625a6a0e88d5abfe43bb977b504
Jaewan Kim [Tue, 18 Apr 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add callback for AVRCP 1.6 support"
am:
58b5789cde
Change-Id: I13633358bb5fbc0bb52808d2e9213434cc27546f
Romain Guy [Tue, 18 Apr 2017 23:36:46 +0000 (23:36 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev
am:
944782fac2
Change-Id: Ia2dd8c4457bdbd41afb43f5648fa96d1a7a48623
Sunny Goyal [Wed, 12 Apr 2017 22:36:42 +0000 (15:36 -0700)]
Creating a common class for loading drawables and handling various badging
Test: Manually tested on device
Bug:
36591157
Change-Id: Ic847537d416650015cecaeb68f47f7f032e0dbaa
TreeHugger Robot [Tue, 18 Apr 2017 23:32:02 +0000 (23:32 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev
Todd Kennedy [Mon, 17 Apr 2017 22:29:46 +0000 (15:29 -0700)]
update docs per API council
Change-Id: Id32be4db7671d3ef99e155f5fc2f3946eac707dd
Fixes:
37322490
Test: treehugger
TreeHugger Robot [Tue, 18 Apr 2017 23:25:53 +0000 (23:25 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
Winson Chung [Tue, 18 Apr 2017 22:05:31 +0000 (15:05 -0700)]
Add remaining default media icons.
- Fix issue where strings were only in overlay and not in base resources
Bug:
36778575
Test: Launch PiP activity with media session, ensure actions show
Change-Id: I062b6c37ff4789bf375670e8ce872f28c578ffca
Eugene Susla [Tue, 18 Apr 2017 23:19:36 +0000 (23:19 +0000)]
Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev
am:
1888f63434
Change-Id: Id8ba012f7aec5abedbbb45a262c19102541bef99
Dan Sandler [Tue, 18 Apr 2017 23:14:32 +0000 (23:14 +0000)]
Merge "Part of global strings change from cellular > mobile." into oc-dev
am:
52fc775091
Change-Id: I07e4318368ffa60d99b4a0b7db501cb0e4615b4e
TreeHugger Robot [Tue, 18 Apr 2017 23:12:35 +0000 (23:12 +0000)]
Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev
Yu Liu [Tue, 18 Apr 2017 23:08:29 +0000 (16:08 -0700)]
Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council
Test: Existing unit tests still pass.
BUG:
36552859
Change-Id: Ib4cdcef90be3d5b3be329dd780bcb40275b89ef4
TreeHugger Robot [Tue, 18 Apr 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Part of global strings change from cellular —> mobile." into oc-dev
Evan Rosky [Tue, 18 Apr 2017 22:59:16 +0000 (22:59 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev
am:
7906d47f69
Change-Id: Ia626e2b34e739ce11d730c44b081e5b5424df0bd
Evan Rosky [Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev
Philip P. Moltmann [Tue, 18 Apr 2017 22:37:12 +0000 (22:37 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
am:
7fa4198ab1
Change-Id: I27fd5421f329fb0bce97334e3388a956984b3d16
Philip P. Moltmann [Tue, 18 Apr 2017 22:28:13 +0000 (22:28 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
Felipe Leme [Tue, 18 Apr 2017 22:27:32 +0000 (22:27 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev
am:
461fd10d6a
Change-Id: Ide1dc0428c0bcc4acc6714eb75de5880a71f237d
Todd Kennedy [Tue, 18 Apr 2017 22:26:22 +0000 (22:26 +0000)]
Merge "update docs per API council" into oc-dev
am:
43b814b1d2
Change-Id: Ia91175538175bd9fdb98fb13151856e8d5f2e395
Chris Craik [Tue, 18 Apr 2017 22:18:32 +0000 (22:18 +0000)]
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
am:
0f9f0f90e7
Change-Id: I9ed9b1d27c28aef19553721266cb531ac410c175
TreeHugger Robot [Tue, 18 Apr 2017 22:15:13 +0000 (22:15 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev
Felipe Leme [Tue, 18 Apr 2017 21:54:33 +0000 (14:54 -0700)]
Clone autofill service settings on managed profile.
Test: manual verification
Change-Id: I9d13e4230265b18444bfd30fd403c5fb98b88159
Fixes:
37351722
nharold [Tue, 18 Apr 2017 22:12:54 +0000 (22:12 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf am:
8508bc52d2
am:
6eab2ee093
Change-Id: Iaa713ba4b20bab12331bd996288ed2440c349db2
Nathan Harold [Tue, 18 Apr 2017 22:11:18 +0000 (22:11 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532 am:
5db180bbb7
am:
7883c5d460
Change-Id: I04198299d43da4c9c91f705acc5520f734ad9249
TreeHugger Robot [Tue, 18 Apr 2017 22:09:25 +0000 (22:09 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:05:30 +0000 (22:05 +0000)]
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
nharold [Tue, 18 Apr 2017 22:02:48 +0000 (22:02 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf
am:
8508bc52d2
Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
Nathan Harold [Tue, 18 Apr 2017 22:01:32 +0000 (22:01 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532
am:
5db180bbb7
Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
Winson Chung [Tue, 18 Apr 2017 21:52:36 +0000 (14:52 -0700)]
Disable PiP when a task is locked.
Bug:
37135610
Test: Start PiP, enable screen pinning, ensure that PiP is dismissed.
Change-Id: Ie5165364db891b13dd4ef282089f915fe9f99615
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am:
fe358c6adf
Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b
Nathan Harold [Tue, 18 Apr 2017 21:50:30 +0000 (21:50 +0000)]
Consistenly Throw IOExceptions from IpSecManager
am:
0bfb207532
Change-Id: I42f4526b43a8de19178a23e5106596f94050c1d4
Mady Mellor [Tue, 18 Apr 2017 21:46:15 +0000 (21:46 +0000)]
Merge "Adjust some of the timings around animating / showing the dismiss gradient" into oc-dev
am:
1e28c8fa33
Change-Id: I0a30560842b0bd4f083c8fe9c04fb9696a658418
Chris Wren [Tue, 18 Apr 2017 17:40:32 +0000 (13:40 -0400)]
guard against nulls in LogMaker
Bug:
36909905
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: Ibd12bf12f9b1ed5fbc926ec04bbfa429ff98f7d2
Bryce Lee [Tue, 18 Apr 2017 21:42:23 +0000 (21:42 +0000)]
Merge "Allow at most one pinned stack task." into oc-dev
am:
467deff7e9
Change-Id: If2e9badaeb31295468ce09ddbcdf45620121a7a6
TreeHugger Robot [Tue, 18 Apr 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Adjust some of the timings around animating / showing the dismiss gradient" into oc-dev
Bryce Lee [Tue, 18 Apr 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Allow at most one pinned stack task." into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 21:22:33 +0000 (21:22 +0000)]
Merge "Minor UI adjustments to a11y button chooser" into oc-dev
am:
585f7c1b20
Change-Id: If24ee756971f9322e0130983d065bb7ab291f12a
Suprabh Shukla [Tue, 18 Apr 2017 21:21:14 +0000 (21:21 +0000)]
Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev
am:
94ac6ae6d9
Change-Id: I7f52edc4dcbd1e7c9e876776412b6387c3e9ecbc
Torne (Richard Coles) [Tue, 18 Apr 2017 21:16:36 +0000 (17:16 -0400)]
Add logging to WebView zygote package preload.
This is a potentially slow event and having a timestamp for when it
started/completed may help to track down a currently-open bug (as well
as enable us to see how long preloading took). This only happens once
per boot and once per WebView update so won't cause a significant amount
of logging.
Bug:
37347817
Test: check for messages in logcat on first use of WebView
Change-Id: Ib6c50eea71324f81cda5b5b1ac91f9dc806e0ab4
Eugene Susla [Tue, 18 Apr 2017 20:45:17 +0000 (13:45 -0700)]
Use wifi icon for wifi devices in companion chooser
Test: Ensure wifi devices have wifi icon
Change-Id: I08c9fba1acaefb097a010b1150cc052d5a397adc
Dan Sandler [Mon, 17 Apr 2017 14:09:24 +0000 (10:09 -0400)]
Part of global strings change from cellular —> mobile.
Bug:
33049102
Fixes:
36389122
Test: no
Change-Id: I0438f63f643d144e065b8394bec36fb6e1ec7aa9
Casey Burkhardt [Tue, 18 Apr 2017 21:09:01 +0000 (21:09 +0000)]
Merge "Minor UI adjustments to a11y button chooser" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 21:07:44 +0000 (21:07 +0000)]
Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev
Romain Guy [Tue, 18 Apr 2017 21:06:49 +0000 (14:06 -0700)]
Change nullability of colorspace parameter
Bug:
37323693
Test: android.graphics.cts.BitmapColorSpaceTest
Change-Id: I705ac18e5c64c028c2e8366a18ec4ef20f44a630
Doris Ling [Tue, 18 Apr 2017 20:42:57 +0000 (20:42 +0000)]
Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev
am:
a86e3d70e3
Change-Id: I68121fbe007d659fb3a4b9930b8457d1289724a1
TreeHugger Robot [Tue, 18 Apr 2017 20:33:43 +0000 (20:33 +0000)]
Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev
Winson Chung [Tue, 18 Apr 2017 19:54:25 +0000 (12:54 -0700)]
Fix issue with PiP actions flashing.
- Instead of recreating the whole layout, only add/hide action views as
necessary
Bug:
35467434
Test: Launch PiP, tap some actions
Change-Id: Ib3cce253228d737bb699f80298001f08121640e4
Abodunrinwa Toki [Tue, 18 Apr 2017 20:22:30 +0000 (20:22 +0000)]
Merge "Move TextClassificationManagerTest to coretests" into oc-dev
am:
bd9ee9f11d
Change-Id: I29f7dc7246be40e49496c094c91ae79b2a5fedaf
Android Build Merger (Role) [Tue, 18 Apr 2017 20:20:00 +0000 (20:20 +0000)]
Merge "DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef am:
28fc6a28aa -s ours am:
4f9d4bfb3e" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 18 Apr 2017 20:19:13 +0000 (20:19 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef am:
28fc6a28aa -s ours
am:
4f9d4bfb3e
Change-Id: I5e760fcb4f5da57dae57a0c80fac4f0915529691
Erik Wolsheimer [Tue, 18 Apr 2017 20:18:57 +0000 (20:18 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef am:
28fc6a28aa
am:
43b98a8f9d -s ours
Change-Id: Idf6c6bcf529e4b7a2973fe9d1ee43aa155282dbd
Jaewan Kim [Fri, 3 Feb 2017 07:21:38 +0000 (16:21 +0900)]
Add callback for AVRCP 1.6 support
Bug:
33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
Abodunrinwa Toki [Tue, 18 Apr 2017 20:13:22 +0000 (20:13 +0000)]
Merge "Move TextClassificationManagerTest to coretests" into oc-dev
Etan Cohen [Tue, 18 Apr 2017 20:10:28 +0000 (20:10 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
am:
c367ee166b
Change-Id: I19d91f8133c7294de3350277efff339bd75f42b8
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:31 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa
Change-Id: Ia0dab8845a34753ed46199462a9e12c25f9a615f
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:30 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa -s ours
Change-Id: I3e83332cd4bd7e51a3394ee5de61afc613fe9552
Etan Cohen [Tue, 18 Apr 2017 20:04:16 +0000 (20:04 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
Erik Wolsheimer [Tue, 18 Apr 2017 20:03:46 +0000 (20:03 +0000)]
DO NOT MERGE Mask case of base or tree permission being null
am:
cb8a640cef
Change-Id: I43289a33b8e1e6df9307cd11891feff4d739da14
phweiss [Tue, 18 Apr 2017 19:58:53 +0000 (19:58 +0000)]
Merge "Decrease number of network logging notifications shown" into oc-dev
am:
11fbd2148f
Change-Id: I26d3966fc079e92fab3377595eec9f01bd17fb90
Chris Craik [Tue, 18 Apr 2017 18:21:55 +0000 (11:21 -0700)]
Re-hide shader mutation, remove colorfilter mutation
Bug:
36025103
Bug:
37327129
Test: boots, CtsGraphicsTestCases passes
Change-Id: I937f8ae26ed47b4811dc033ed91c257670fc3a39
OSDN Git Service
