OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "update docs per API council" into oc-dev
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

7 years agoMerge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
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

7 years agoMerge "update docs per API council" 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

7 years agoMerge changes I062b6c37,Ie5165364,Ib3cce253 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.

7 years agoMerge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
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

7 years agoMerge "better defualt behaviour for msim" into oc-dev
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

7 years agoMerge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
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

7 years agoMerge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
Nathan Harold [Wed, 19 Apr 2017 00:36:16 +0000 (00:36 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev

7 years agoMerge "better defualt behaviour for msim" 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

7 years agoMerge "Consistenly Throw IOExceptions from IpSecManager" 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

7 years agoMerge "Update Overview content descriptions." 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

7 years agoMerge "Clone autofill service settings on managed profile." into oc-dev
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

7 years agoMerge "Update Overview content descriptions." into oc-dev
Winson Chung [Wed, 19 Apr 2017 00:22:35 +0000 (00:22 +0000)]
Merge "Update Overview content descriptions." into oc-dev

7 years agoMerge "Clone autofill service settings on managed profile." 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

7 years agoMerge "Add callback for AVRCP 1.6 support" am: 58b5789cde am: 16e5c08cbd
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

7 years agoMerge "Add logging to WebView zygote package preload." into oc-dev
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

7 years agoMerge "guard against nulls in LogMaker" into oc-dev
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

7 years agoMerge "Add logging to WebView zygote package preload." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 23:43:21 +0000 (23:43 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev

7 years agoMerge "Add callback for AVRCP 1.6 support" am: 58b5789cde
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

7 years agoMerge "Add callback for AVRCP 1.6 support"
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

7 years agoMerge "Change nullability of colorspace parameter" into oc-dev
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

7 years agoMerge "guard against nulls in LogMaker" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 23:32:02 +0000 (23:32 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev

7 years agoupdate docs per API council
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

7 years agoMerge "Change nullability of colorspace parameter" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 23:25:53 +0000 (23:25 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev

7 years agoMerge "Add callback for AVRCP 1.6 support"
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"

7 years agoAdd remaining default media icons.
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

7 years agoMerge "Use wifi icon for wifi devices in companion chooser" into oc-dev
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

7 years agoMerge "Part of global strings change from cellular > mobile." into oc-dev
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

7 years agoMerge "Use wifi icon for wifi devices in companion chooser" into oc-dev
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

7 years agoMerge "Part of global strings change from cellular —> mobile." into oc-dev
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

7 years agoMerge "Ignore nested keyboard navigation clusters" 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

7 years agoMerge "Ignore nested keyboard navigation clusters" into oc-dev
Evan Rosky [Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev

7 years agoMerge "Change saveOnAllViewsInsible from boolean to flags" 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

7 years agoMerge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
Philip P. Moltmann [Tue, 18 Apr 2017 22:28:13 +0000 (22:28 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev

7 years agoMerge "Fixed WTF that happens on race condition." 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

7 years agoMerge "update docs per API council" into oc-dev
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

7 years agoMerge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
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

7 years agoMerge "Fixed WTF that happens on race condition." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:15:13 +0000 (22:15 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev

7 years agoClone autofill service settings on managed profile.
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

7 years agoMerge changes from topic 'ipsec-hide-overloads' am: fe358c6adf am: 8508bc52d2
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

7 years agoConsistenly Throw IOExceptions from IpSecManager am: 0bfb207532 am: 5db180bbb7
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

7 years agoMerge "update docs per API council" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:09:25 +0000 (22:09 +0000)]
Merge "update docs per API council" into oc-dev

7 years agoMerge "Re-hide shader mutation, remove colorfilter mutation" 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

7 years agoMerge changes from topic 'ipsec-hide-overloads' am: fe358c6adf
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

7 years agoConsistenly Throw IOExceptions from IpSecManager am: 0bfb207532
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

7 years agoDisable PiP when a task is locked.
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

7 years agoMerge changes from topic 'ipsec-hide-overloads'
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am: fe358c6adf

Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b

7 years agoConsistenly Throw IOExceptions from IpSecManager
Nathan Harold [Tue, 18 Apr 2017 21:50:30 +0000 (21:50 +0000)]
Consistenly Throw IOExceptions from IpSecManager
am: 0bfb207532

Change-Id: I42f4526b43a8de19178a23e5106596f94050c1d4

7 years agoMerge "Adjust some of the timings around animating / showing the dismiss gradient...
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

7 years agoguard against nulls in LogMaker
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

7 years agoMerge "Allow at most one pinned stack task." into oc-dev
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

7 years agoMerge "Adjust some of the timings around animating / showing the dismiss gradient...
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

7 years agoMerge "Allow at most one pinned stack task." 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

7 years agoMerge "Minor UI adjustments to a11y button chooser" 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

7 years agoMerge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev
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

7 years agoAdd logging to WebView zygote package preload.
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

7 years agoUse wifi icon for wifi devices in companion chooser
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

7 years agoPart of global strings change from cellular —> mobile.
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

7 years agoMerge "Minor UI adjustments to a11y button chooser" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 21:09:01 +0000 (21:09 +0000)]
Merge "Minor UI adjustments to a11y button chooser" into oc-dev

7 years agoMerge "Fixing javadoc errors for pm#canRequestPackageInstalls" 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

7 years agoChange nullability of colorspace parameter
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

7 years agoMerge "Check if singleLineTitle attribute is set for the preference." into oc-dev
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

7 years agoMerge "Check if singleLineTitle attribute is set for the preference." into oc-dev
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

7 years agoFix issue with PiP actions flashing.
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

7 years agoMerge "Move TextClassificationManagerTest to coretests" into oc-dev
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

7 years agoMerge "DO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef...
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

7 years agoDO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef am: 28fc6...
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

7 years agoDO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef am: 28fc6...
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

7 years agoAdd callback for AVRCP 1.6 support
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

7 years agoMerge "Move TextClassificationManagerTest to coretests" into oc-dev
Abodunrinwa Toki [Tue, 18 Apr 2017 20:13:22 +0000 (20:13 +0000)]
Merge "Move TextClassificationManagerTest to coretests" into oc-dev

7 years agoMerge "[AWARE] Implement custom Wi-Fi Aware network specifier" 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

7 years agoDO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef
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

7 years agoDO NOT MERGE Mask case of base or tree permission being null am: cb8a640cef
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

7 years agoMerge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
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

7 years agoDO NOT MERGE Mask case of base or tree permission being null
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

7 years agoMerge "Decrease number of network logging notifications shown" into oc-dev
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

7 years agoRe-hide shader mutation, remove colorfilter mutation
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

7 years agoMerge "Decrease number of network logging notifications shown" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Decrease number of network logging notifications shown" into oc-dev

7 years agoMerge "Fixed some pip state acitvity accounting." into oc-dev
Wale Ogunwale [Tue, 18 Apr 2017 19:48:29 +0000 (19:48 +0000)]
Merge "Fixed some pip state acitvity accounting." into oc-dev
am: 6535ef67b7

Change-Id: Ibcb5992194f8b50a0d6451e43918e1260533c635

7 years agoAdjust some of the timings around animating / showing the dismiss gradient
Mady Mellor [Tue, 18 Apr 2017 19:48:04 +0000 (12:48 -0700)]
Adjust some of the timings around animating / showing the dismiss gradient

Dan wanted longer + linear fade in of the dismiss gradient. Also wanted
fade out to match the timing of 'snap to edge'.

Test: Manual -- move PIP around, observe how gradient fades in / out
Bug: 35358628
Change-Id: I847d96e70184c0093e64a7e2e895a9c5f30fea8b

7 years agoMerge "Fixed some pip state acitvity accounting." into oc-dev
Wale Ogunwale [Tue, 18 Apr 2017 19:40:43 +0000 (19:40 +0000)]
Merge "Fixed some pip state acitvity accounting." into oc-dev

7 years agoMerge "Lock all the things" into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 19:21:51 +0000 (19:21 +0000)]
Merge "Lock all the things" into oc-dev
am: 7e4e923a8c

Change-Id: Iee7b299db15a6d6ada863b2fddbad9dfed3b700d

7 years agoMerge "Lock all the things" into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 19:13:05 +0000 (19:13 +0000)]
Merge "Lock all the things" into oc-dev

7 years agoUpdate Overview content descriptions.
Winson Chung [Tue, 18 Apr 2017 18:55:37 +0000 (11:55 -0700)]
Update Overview content descriptions.

- If there is a task label with a provided task description, ensure that
  it is used instead of the activity label when generating the content
  description (the concatenation of the badged application name and
  activity label.
- Also fix a case where content descriptions can go stale if they are
  updated between first preloaded. Just don't cache the content
  description if there is a task description.

Bug: 37417229
Test: Launch Play store, go to Overview
Change-Id: Ieeef9ecd93759c130dc66902f249783e7d218be7

7 years agoMerge "MediaPlayer/ModularDrm API review" into oc-dev
Hassan Shojania [Tue, 18 Apr 2017 18:50:32 +0000 (18:50 +0000)]
Merge "MediaPlayer/ModularDrm API review" into oc-dev
am: 62a5d29f2d

Change-Id: Id4e021e15c0c42a8c075fd393c07938e17e9a6fe

7 years agoDO NOT MERGE Mask case of base or tree permission being null
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null

Bug: 34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2

7 years agoMerge "MediaPlayer/ModularDrm API review" into oc-dev
Hassan Shojania [Tue, 18 Apr 2017 18:41:23 +0000 (18:41 +0000)]
Merge "MediaPlayer/ModularDrm API review" into oc-dev

7 years agoMerge changes from topic 'ipsec-hide-overloads'
nharold [Tue, 18 Apr 2017 18:35:20 +0000 (18:35 +0000)]
Merge changes from topic 'ipsec-hide-overloads'

* changes:
  Hide Socket+DatagramSocket IpSecTransform methods
  Consistenly Throw IOExceptions from IpSecManager

7 years agoLock all the things
Julia Reynolds [Tue, 18 Apr 2017 13:28:22 +0000 (09:28 -0400)]
Lock all the things

Fix some instances of .*Locked() methods being called without
holding mNotificationLock.

Also, if this happens again, don't crash system server

Change-Id: I0a51310a6f6c8b07266092176e189e7cd08778cc
Fixes: 37444864
Test: runtest systemui-notification

7 years agoMerge "Don't let toasting throw a runtime exception." into oc-dev
Geoffrey Pitsch [Tue, 18 Apr 2017 17:50:49 +0000 (17:50 +0000)]
Merge "Don't let toasting throw a runtime exception." into oc-dev
am: 4b0d2bf70a

Change-Id: Ic37f81a2f8617851b50eb6e44f5fb7e9d2e0a1f0

7 years agoAllow at most one pinned stack task.
Bryce Lee [Mon, 10 Apr 2017 22:06:33 +0000 (15:06 -0700)]
Allow at most one pinned stack task.

This changelist enforces only one task may be present in the pinned
stack at a time. If a task is already persent, the existing task is
moved to the fullscreen stack.

Fixes: 36844394
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerPinnedStackTests#testPipMovedToFullscreenStack
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests#testDisallowMultipleTasksInPinnedStack

Change-Id: Iaf0fbda6df835d93738fdf6f7f3a8c5956c2b262

7 years agoFixed some pip state acitvity accounting.
Wale Ogunwale [Tue, 18 Apr 2017 14:25:20 +0000 (07:25 -0700)]
Fixed some pip state acitvity accounting.

- Corrected ActivityRecord.checkEnterPictureInPictureState() to return
false if the activity doesn't support Pip.
- Wait for previous activity that supports pip to pause before resuming
the next activity with FLAG_RESUME_WHILE_PAUSING so that the activity
has a chance to enter Pip before we resume the next activity. Currently
disabled until we figure-out if callers are passing in the right value
for prev.
- Changed stopActivityLocked() to call setVisible() instead of
setVisibility()...yeah this isn't confusing...

Change-Id: If2336ece4fe5b7104c9b301a4ded5cadc2c2f7cb
Bug: 37370508
Test: manual

7 years agoMerge "Don't let toasting throw a runtime exception." into oc-dev
Geoffrey Pitsch [Tue, 18 Apr 2017 17:41:50 +0000 (17:41 +0000)]
Merge "Don't let toasting throw a runtime exception." into oc-dev

7 years agoDon't let toasting throw a runtime exception.
Geoffrey Pitsch [Tue, 18 Apr 2017 17:19:48 +0000 (13:19 -0400)]
Don't let toasting throw a runtime exception.

Not sure why is complaining about the Looper.
(The toast is debug code that will be removed for ship.)

Change-Id: I5e2ecbe40687cd626b235e248fe6d12fea14204a
Fixes: 37455183
Test: runtest systemui-notification

7 years agoChange saveOnAllViewsInsible from boolean to flags
Philip P. Moltmann [Tue, 18 Apr 2017 00:11:01 +0000 (17:11 -0700)]
Change saveOnAllViewsInsible from boolean to flags

Change-Id: Ibd6f283479bad841eb7b20bb8d006562c4398e9f
Fixes: 35708237
Test: CtsAutoFillServiceTestCases

7 years agoMerge "Remove round rect clipping optimization." into oc-dev
Derek Sollenberger [Tue, 18 Apr 2017 16:19:12 +0000 (16:19 +0000)]
Merge "Remove round rect clipping optimization." into oc-dev
am: 190fe086df

Change-Id: I7b457216863872d7287e777097e04f99d2f18326

7 years agoMerge "Remove round rect clipping optimization." into oc-dev
Derek Sollenberger [Tue, 18 Apr 2017 16:06:35 +0000 (16:06 +0000)]
Merge "Remove round rect clipping optimization." into oc-dev

7 years agoMerge "Log screen-on latency with tron" into oc-dev
Makoto Onuki [Tue, 18 Apr 2017 16:03:29 +0000 (16:03 +0000)]
Merge "Log screen-on latency with tron" into oc-dev
am: 2b499e4eba

Change-Id: I403d3daa5c12dc1465ae8d1a37dc6cddc27f18f9

7 years agoMerge "Vol key presses: active stream has priority of set control stream" into oc-dev
Jean-Michel Trivi [Tue, 18 Apr 2017 16:02:08 +0000 (16:02 +0000)]
Merge "Vol key presses: active stream has priority of set control stream" into oc-dev
am: 031cf14582

Change-Id: I947a90d8af6c77f619edc67f0338e4580727f1d9

7 years agoMerge "Log screen-on latency with tron" into oc-dev
Makoto Onuki [Tue, 18 Apr 2017 15:56:27 +0000 (15:56 +0000)]
Merge "Log screen-on latency with tron" into oc-dev