OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
Robert Shih [Fri, 12 May 2017 02:28:18 +0000 (02:28 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
am: ffb563d82d

Change-Id: I9762506997220b4f22589cc3c6542798175d873c

7 years agoMerge "Decrease default number of partitions from 64 to 10." into oc-dev
Felipe Leme [Fri, 12 May 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev
am: 203ec51e2b

Change-Id: I41e7c2fe4b0022330d1b67580334030e411dfbce

7 years agoMerge "Merge "Only save focus in keyboard navigation clusters when appropriate" into...
Android Build Merger (Role) [Fri, 12 May 2017 02:16:27 +0000 (02:16 +0000)]
Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am: f14aea9f8b" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2...
Android Build Merger (Role) [Fri, 12 May 2017 02:16:19 +0000 (02:16 +0000)]
Merge "Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0" into nyc-mr2-dev-plus-aosp am: 94d78f5e31" into oc-dev-plus-aosp

7 years agoMerge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
Evan Rosky [Fri, 12 May 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
am: f14aea9f8b

Change-Id: If113fe3fc6516b293a532a076ed37c566eddac2f

7 years agoMerge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am...
Chen Xu [Fri, 12 May 2017 02:14:29 +0000 (02:14 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0" into nyc-mr2-dev-plus-aosp
am: 94d78f5e31

Change-Id: Ic3c4ea573ee8cff925d876e3205e923136a083e2

7 years agoMerge "Merge "Only spawn one binder thread for screencap." into oc-dev am: b1edc48db0...
Android Build Merger (Role) [Fri, 12 May 2017 02:14:12 +0000 (02:14 +0000)]
Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am: b1edc48db0" into oc-dev-plus-aosp

7 years agoMerge "Only spawn one binder thread for screencap." into oc-dev
Martijn Coenen [Fri, 12 May 2017 02:09:15 +0000 (02:09 +0000)]
Merge "Only spawn one binder thread for screencap." into oc-dev
am: b1edc48db0

Change-Id: I251c7b72196f8996051b538a59fd466b65757ce4

7 years agoMerge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3...
Chen Xu [Fri, 12 May 2017 02:08:51 +0000 (02:08 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0
am: 44cb5df46f

Change-Id: I3a7b4f735da8c92a839e6d4f3a00378f68397fa6

7 years agoMerge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b...
Android Build Merger (Role) [Fri, 12 May 2017 01:17:47 +0000 (01:17 +0000)]
Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp

7 years agoMerge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb
Siarhei Vishniakou [Fri, 12 May 2017 01:00:34 +0000 (01:00 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb
am: 50c5253c2d

Change-Id: I965b2ad6b603dba82116180a43fc20684d2f1b59

7 years agoMerge "Fix support for @empty in style resolution" into oc-dev
Adam Lesinski [Fri, 12 May 2017 01:00:00 +0000 (01:00 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev
am: 7d75f49175

Change-Id: Ie5a046f75a7c7fa13d330b90f3b9a8ff6c5ac373

7 years agoMerge "Merge "Finish issue #37815224: DeviceManagementService is incorrectly..."...
Android Build Merger (Role) [Fri, 12 May 2017 00:34:33 +0000 (00:34 +0000)]
Merge "Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev am: 8d0ba598cf" into oc-dev-plus-aosp

7 years agoMerge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
Dianne Hackborn [Fri, 12 May 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
am: 8d0ba598cf

Change-Id: Ie1dd7e7f3ceef9a39439a0bb62770ec90128525a

7 years agoMerge "Merge "AOD: Fix wakeup animation duration" into oc-dev am: 34480d2ce0" into...
Android Build Merger (Role) [Fri, 12 May 2017 00:32:17 +0000 (00:32 +0000)]
Merge "Merge "AOD: Fix wakeup animation duration" into oc-dev am: 34480d2ce0" into oc-dev-plus-aosp

7 years agoMerge "AOD: Fix wakeup animation duration" into oc-dev
Adrian Roos [Fri, 12 May 2017 00:28:50 +0000 (00:28 +0000)]
Merge "AOD: Fix wakeup animation duration" into oc-dev
am: 34480d2ce0

Change-Id: I907a8f5a42f17b0b08e4442952e86dcb32eac4f9

7 years agoMerge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11
Jerry Zhang [Fri, 12 May 2017 00:26:47 +0000 (00:26 +0000)]
Merge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11
am: f94abc1009  -s ours

Change-Id: Ie32e48f15e13d08ea3ae1a4d795131000f3d50e6

7 years agoMerge "Lock relevant fields on channel update" into oc-dev
Julia Reynolds [Fri, 12 May 2017 00:08:17 +0000 (00:08 +0000)]
Merge "Lock relevant fields on channel update" into oc-dev
am: 6307ac52e5

Change-Id: I7f47872b2d166353365517e7407cda43666ae70c

7 years agoMerge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am...
Android Build Merger (Role) [Thu, 11 May 2017 23:07:45 +0000 (23:07 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3
Chen Xu [Thu, 11 May 2017 23:05:46 +0000 (23:05 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3
am: 1f354082c0

Change-Id: I539c4fc14ab7e41e5c43799387685186bb9f7f31

7 years agoMerge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 22:40:34 +0000 (22:40 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev

7 years agoMerge "Decrease default number of partitions from 64 to 10." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 22:37:42 +0000 (22:37 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev

7 years agoMerge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
Evan Rosky [Thu, 11 May 2017 22:26:09 +0000 (22:26 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev

7 years agoMerge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3
Chen Xu [Thu, 11 May 2017 22:13:25 +0000 (22:13 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3
am: 1f354082c0

Change-Id: Ide900754bb6b41b670a416b9933ad0b7d7bcc79b

7 years agoMerge "Only spawn one binder thread for screencap." into oc-dev
Martijn Coenen [Thu, 11 May 2017 22:07:31 +0000 (22:07 +0000)]
Merge "Only spawn one binder thread for screencap." into oc-dev

7 years agoMerge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353
Siarhei Vishniakou [Thu, 11 May 2017 22:02:06 +0000 (22:02 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353
am: 96d3b668bb

Change-Id: I38a84e41505f7c55966d5ddedd12ddf5f1e9f403

7 years agoMerge "Detect isVisibleToUser post layout" into oc-dev
Svet Ganov [Thu, 11 May 2017 22:00:20 +0000 (22:00 +0000)]
Merge "Detect isVisibleToUser post layout" into oc-dev
am: a7af385208

Change-Id: Ie6f7a111a329cde1e5cd674ec395af11c8a24e2b

7 years agoMerge "Fix support for @empty in style resolution" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev

7 years agoMerge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:37:59 +0000 (21:37 +0000)]
Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev

7 years agoMerge "AOD: Fix wakeup animation duration" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:18:28 +0000 (21:18 +0000)]
Merge "AOD: Fix wakeup animation duration" into oc-dev

7 years agoMerge "Ensure remote calls to a fill service timeout." into oc-dev
Svet Ganov [Thu, 11 May 2017 21:07:56 +0000 (21:07 +0000)]
Merge "Ensure remote calls to a fill service timeout." into oc-dev
am: 208711a1e4

Change-Id: Ic53bf9aa7e227613e4c7e9a76a3be05d05fb977e

7 years agoMerge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked...
Tony Mak [Thu, 11 May 2017 21:04:18 +0000 (21:04 +0000)]
Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked" into oc-dev
am: e35e223a81

Change-Id: Ic55181bb635be2844b46cb546a24daa9c4ea4b68

7 years agoMerge "Allow for SDK 26 Activities to specify orientation when not fullscreen." into...
Bryce Lee [Thu, 11 May 2017 21:00:35 +0000 (21:00 +0000)]
Merge "Allow for SDK 26 Activities to specify orientation when not fullscreen." into oc-dev
am: e53243cb92

Change-Id: I282eb577bb1b04e9121fa218765578e93e5a5ab6

7 years agoMerge "Telephony: Fix the failure of copying SMS to SIM card for sub2"
Chen Xu [Thu, 11 May 2017 20:59:21 +0000 (20:59 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2"
am: 7eca824ce3

Change-Id: I153e490abc6a37fabfdb51fddc195ed15cec85fb

7 years agoMerge "Don't skip intents where config changed." am: 29a28235b8
Jerry Zhang [Thu, 11 May 2017 20:58:05 +0000 (20:58 +0000)]
Merge "Don't skip intents where config changed." am: 29a28235b8
am: d2e44e8d11

Change-Id: I7dc7363297e5073266779e5986e12b3115590bdc

7 years agoMerge "Lock relevant fields on channel update" into oc-dev
Julia Reynolds [Thu, 11 May 2017 20:55:23 +0000 (20:55 +0000)]
Merge "Lock relevant fields on channel update" into oc-dev

7 years agoMerge "Adding 'uhid' permission for bluetooth stack."
Siarhei Vishniakou [Thu, 11 May 2017 20:47:56 +0000 (20:47 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack."
am: 3e010d1353

Change-Id: Ia68bde76b5a4c25ce24c3141ea29a242d50ee355

7 years agoMerge "Detect isVisibleToUser post layout" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 20:38:23 +0000 (20:38 +0000)]
Merge "Detect isVisibleToUser post layout" into oc-dev

7 years agoMerge "Ensure remote calls to a fill service timeout." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 20:30:55 +0000 (20:30 +0000)]
Merge "Ensure remote calls to a fill service timeout." into oc-dev

7 years agoMerge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked...
TreeHugger Robot [Thu, 11 May 2017 20:25:48 +0000 (20:25 +0000)]
Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked" into oc-dev

7 years agoMerge "Don't skip intents where config changed."
Jerry Zhang [Thu, 11 May 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Don't skip intents where config changed."
am: 29a28235b8

Change-Id: I65c377c4fb84223787245e28f0de31a0e4f8a6e5

7 years agoMerge "Allow for SDK 26 Activities to specify orientation when not fullscreen." into...
Bryce Lee [Thu, 11 May 2017 20:06:20 +0000 (20:06 +0000)]
Merge "Allow for SDK 26 Activities to specify orientation when not fullscreen." into oc-dev

7 years agoAudioCapabilities: handle non-standard codec max input channels
Robert Shih [Thu, 11 May 2017 19:32:59 +0000 (12:32 -0700)]
AudioCapabilities: handle non-standard codec max input channels

Bug: 34073927
Change-Id: Id9b99e572bf9c90fa236b762620fb7f6eb284f1e

7 years agoMerge "Fix a security exception when unbinding services" into oc-dev
Amith Yamasani [Thu, 11 May 2017 19:42:46 +0000 (19:42 +0000)]
Merge "Fix a security exception when unbinding services" into oc-dev
am: 33532e0208

Change-Id: Ia3a14b69f27106a6c7ca4a6625a0a103fb752c51

7 years agoMerge "Organize multi-window enabling" into oc-dev
Andrii Kulian [Thu, 11 May 2017 19:23:32 +0000 (19:23 +0000)]
Merge "Organize multi-window enabling" into oc-dev
am: cad3c3251c

Change-Id: Ic7a4976186161c80ba02e1b59d8898f8765b50f3

7 years agoMerge "Fix a security exception when unbinding services" into oc-dev
Amith Yamasani [Thu, 11 May 2017 19:17:07 +0000 (19:17 +0000)]
Merge "Fix a security exception when unbinding services" into oc-dev

7 years agoMerge "Telephony: Fix the failure of copying SMS to SIM card for sub2"
Chen Xu [Thu, 11 May 2017 19:15:50 +0000 (19:15 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2"

7 years agoFinish issue #37815224: DeviceManagementService is incorrectly...
Dianne Hackborn [Thu, 11 May 2017 19:14:31 +0000 (12:14 -0700)]
Finish issue #37815224: DeviceManagementService is incorrectly...

...starting services from jobs

Remove dmagent from whitelist.

Test: manual

Change-Id: Id13b95b9ca4f8fa890f4e20cf133a6f4bc0e3cc5

7 years agoMerge "Organize multi-window enabling" into oc-dev
Andrii Kulian [Thu, 11 May 2017 19:11:53 +0000 (19:11 +0000)]
Merge "Organize multi-window enabling" into oc-dev

7 years agoMerge "AAPT2: Add option to disable PNG crunching" into oc-dev
Adam Lesinski [Thu, 11 May 2017 19:06:18 +0000 (19:06 +0000)]
Merge "AAPT2: Add option to disable PNG crunching" into oc-dev
am: fb194bb81c

Change-Id: Ie471641c9b5fdb38c9623cc35cb3cc41c05c28a5

7 years agoMerge "Adding 'uhid' permission for bluetooth stack."
Siarhei Vishniakou [Thu, 11 May 2017 19:02:29 +0000 (19:02 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack."

7 years agoAOD: Fix wakeup animation duration
Adrian Roos [Thu, 11 May 2017 18:46:59 +0000 (11:46 -0700)]
AOD: Fix wakeup animation duration

Wakeup animation duration was introduced in one CL, but was not
visible to the other CL, now that both CLs have been merged fix up
the duration.

Fixes: 34716110
Test: Trigger Ambient Display, turn on device, observe that both the clock and panel animation take the same time.
Change-Id: I310ba9c5be2e6ddd4fdf0a793eadb687e100aacd

7 years agoMerge "AAPT: Allow including dependencies in dump command" into oc-dev
Adam Lesinski [Thu, 11 May 2017 18:49:14 +0000 (18:49 +0000)]
Merge "AAPT: Allow including dependencies in dump command" into oc-dev
am: 33644ff3f9

Change-Id: Ibabd8a7517df444c97a4d1eb0793b9179b2a121f

7 years agoMerge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp...
Dianne Hackborn [Thu, 11 May 2017 18:45:00 +0000 (18:45 +0000)]
Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev
am: c3b938ca5e

Change-Id: I585bf57074064761c7d216f05be23d7f044208fa

7 years agoMerge "AAPT2: Add option to disable PNG crunching" into oc-dev
Adam Lesinski [Thu, 11 May 2017 18:39:00 +0000 (18:39 +0000)]
Merge "AAPT2: Add option to disable PNG crunching" into oc-dev

7 years agoMerge "AAPT: Allow including dependencies in dump command" into oc-dev
Adam Lesinski [Thu, 11 May 2017 18:36:38 +0000 (18:36 +0000)]
Merge "AAPT: Allow including dependencies in dump command" into oc-dev

7 years agoMerge "Don't skip intents where config changed."
Treehugger Robot [Thu, 11 May 2017 18:31:27 +0000 (18:31 +0000)]
Merge "Don't skip intents where config changed."

7 years agoMerge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp...
Dianne Hackborn [Thu, 11 May 2017 18:28:31 +0000 (18:28 +0000)]
Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev

7 years agoFix support for @empty in style resolution
Adam Lesinski [Tue, 9 May 2017 22:25:37 +0000 (15:25 -0700)]
Fix support for @empty in style resolution

If @empty is encountered in XML, do not fallback
to searching through the theme.

Bug: 36891052
Test: make aapt2_tests
Test: bit CtsContentTestCases:android.content.res.cts.TypedArrayTest
Change-Id: Ie3bf7b70af9c7913513a1092afd95d26bec5e635

7 years agoMerge "support horizontal scroll and zoom for webview" am: 63621ece0b am: fa9278293f
Chen Xu [Thu, 11 May 2017 18:27:07 +0000 (18:27 +0000)]
Merge "support horizontal scroll and zoom for webview" am: 63621ece0b am: fa9278293f
am: 224b9c2895  -s ours

Change-Id: Ifc7ffb4f37a3788a0674005311b0f8c4fa7c7fe1

7 years agoMerge "support horizontal scroll and zoom for webview" am: 63621ece0b
Chen Xu [Thu, 11 May 2017 18:15:29 +0000 (18:15 +0000)]
Merge "support horizontal scroll and zoom for webview" am: 63621ece0b
am: fa9278293f

Change-Id: I49fbed7401066cf441712811ab625abddc8b92b8

7 years agoMerge "Fixes divider position after minimizing and unminimizing with ime open" into...
Matthew Ng [Thu, 11 May 2017 18:14:19 +0000 (18:14 +0000)]
Merge "Fixes divider position after minimizing and unminimizing with ime open" into oc-dev
am: 81a57133e8

Change-Id: I9d3f0778d8153dcf172e2dcd4b7b5653e94e6d62

7 years agoFix a security exception when unbinding services
Amith Yamasani [Thu, 11 May 2017 18:13:52 +0000 (11:13 -0700)]
Fix a security exception when unbinding services

Clear calling identity before calling oom adjust.

Bug: 38183641
Test: manual
Change-Id: Ia3cc7bb83a94d1bb280a43912a250bddc9ef2c11

7 years agoMerge "support horizontal scroll and zoom for webview"
Chen Xu [Thu, 11 May 2017 18:08:35 +0000 (18:08 +0000)]
Merge "support horizontal scroll and zoom for webview"
am: 63621ece0b

Change-Id: If60034faacbda088d94309b39cd61999838d2ac3

7 years agoMerge "Add vr platform lib" into oc-dev
Steven Thomas [Thu, 11 May 2017 18:05:20 +0000 (18:05 +0000)]
Merge "Add vr platform lib" into oc-dev
am: a22a5d83c2

Change-Id: Ie974942e449396dfb091c37f40bd35259481738f

7 years agoMerge "Removed obsolete a11y support for ClickableSpan" into oc-dev
Phil Weaver [Thu, 11 May 2017 17:59:07 +0000 (17:59 +0000)]
Merge "Removed obsolete a11y support for ClickableSpan" into oc-dev
am: f970743e15

Change-Id: I75df9d3ab5abd23fa7585575786bcc0b88101bf5

7 years agoMerge "Fixes divider position after minimizing and unminimizing with ime open" into...
TreeHugger Robot [Thu, 11 May 2017 17:49:46 +0000 (17:49 +0000)]
Merge "Fixes divider position after minimizing and unminimizing with ime open" into oc-dev

7 years agoOnly spawn one binder thread for screencap.
Martijn Coenen [Thu, 11 May 2017 16:40:45 +0000 (09:40 -0700)]
Only spawn one binder thread for screencap.

To work around race conditions in libbinder when
spawning new threads while being shut down.

Bug: 36066697
Test: screencap still works
Change-Id: I774d3dc2491bb578a12dede90cc7fcded976f13f

7 years agoLock relevant fields on channel update
Julia Reynolds [Mon, 8 May 2017 16:55:24 +0000 (12:55 -0400)]
Lock relevant fields on channel update

This is safe for O as all updates come from a trusted
source.

Change-Id: Iab8ec1e68f8f9f9e345ebf4d5e44718191cc49e6
Fixes: 37986254
Test: runtest systemui-notification

7 years agoDecrease default number of partitions from 64 to 10.
Felipe Leme [Wed, 10 May 2017 21:37:06 +0000 (14:37 -0700)]
Decrease default number of partitions from 64 to 10.

...and also added shell cmds to set it so it can be CTS-tested.

Bug: 37997043

Test: manual verification
Test: PartitionedActivityTest.testNoMorePartitionsAfterLimitReached()
Test: CtsAutoFillServiceTestCases pass

Change-Id: I783bd2d3ed248484adeeebd2df425a6304362ad9

7 years agoMerge "support horizontal scroll and zoom for webview"
Chen Xu [Thu, 11 May 2017 17:17:28 +0000 (17:17 +0000)]
Merge "support horizontal scroll and zoom for webview"

7 years agoMerge "Add vr platform lib" into oc-dev
Steven Thomas [Thu, 11 May 2017 17:16:45 +0000 (17:16 +0000)]
Merge "Add vr platform lib" into oc-dev

7 years agoMerge "Removed obsolete a11y support for ClickableSpan" into oc-dev
Phil Weaver [Thu, 11 May 2017 17:12:40 +0000 (17:12 +0000)]
Merge "Removed obsolete a11y support for ClickableSpan" into oc-dev

7 years agosupport horizontal scroll and zoom for webview
fionaxu [Thu, 4 May 2017 06:19:25 +0000 (23:19 -0700)]
support horizontal scroll and zoom for webview

Bug: 37913717
Test: Manual test for horizontal scroll
Merged-in: I97f19030ae034910c8d6f3e23634f55d43ab6589
Change-Id: I97f19030ae034910c8d6f3e23634f55d43ab6589

7 years agoMerge "Avoid NPE when getting last shutdown reason." into oc-dev
Michael Wright [Thu, 11 May 2017 16:04:53 +0000 (16:04 +0000)]
Merge "Avoid NPE when getting last shutdown reason." into oc-dev
am: 0cf6b908a8

Change-Id: Ib31807bddc953d2bba068359c9468257d1b92a9f

7 years agoMerge "Avoid NPE when getting last shutdown reason." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 15:54:12 +0000 (15:54 +0000)]
Merge "Avoid NPE when getting last shutdown reason." into oc-dev

7 years agoMerge "Propagate UIDs for all SurfaceControl instances" into oc-dev
Albert Chaulk [Thu, 11 May 2017 15:43:47 +0000 (15:43 +0000)]
Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev
am: 6c34dd58f6

Change-Id: Ia3aa4d9537f141a3132afefbcdac5b0bda61722b

7 years agoAllow for SDK 26 Activities to specify orientation when not fullscreen.
Bryce Lee [Thu, 11 May 2017 14:59:41 +0000 (07:59 -0700)]
Allow for SDK 26 Activities to specify orientation when not fullscreen.

Change-Id: I9137a7ba7593dcd6031e1fcbcd6dcc0a287d707b
Fixes: 38221413
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testNonfullscreenAppOrientationRequests
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testLegacyNonFullscreenActivityPermitted

7 years agoMerge "Propagate UIDs for all SurfaceControl instances" into oc-dev
Albert Chaulk [Thu, 11 May 2017 15:19:21 +0000 (15:19 +0000)]
Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev

7 years agoMerge "Add an O-release targetAPI check for Canvas.setBitmap. am: d70695ee34" into...
Android Build Merger (Role) [Thu, 11 May 2017 14:34:40 +0000 (14:34 +0000)]
Merge "Add an O-release targetAPI check for Canvas.setBitmap. am: d70695ee34" into oc-dev-plus-aosp

7 years agoMerge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2...
Android Build Merger (Role) [Thu, 11 May 2017 14:33:01 +0000 (14:33 +0000)]
Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2" into oc-dev-plus-aosp

7 years agoAdd an O-release targetAPI check for Canvas.setBitmap.
Derek Sollenberger [Thu, 11 May 2017 14:32:07 +0000 (14:32 +0000)]
Add an O-release targetAPI check for Canvas.setBitmap.
am: d70695ee34

Change-Id: Ic486fce9a8471c298ba2cd2413eeb9d1b218ac71

7 years agoMerge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0
Hugo Benichi [Thu, 11 May 2017 14:28:23 +0000 (14:28 +0000)]
Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0
am: 164854bde2

Change-Id: I1495249f1ced84438dbd5dd0ad6678e2ee4062cb

7 years agoMerge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev
Jason Monk [Thu, 11 May 2017 14:27:53 +0000 (14:27 +0000)]
Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev
am: 6d4db456ea

Change-Id: Ied35cc5e37da58f3631a733566efbfd381b495b5

7 years agoMerge changes Ie762ce75,I611fd791 am: 21a57f263f
Hugo Benichi [Thu, 11 May 2017 13:56:22 +0000 (13:56 +0000)]
Merge changes Ie762ce75,I611fd791 am: 21a57f263f
am: cc9f695ba0

Change-Id: I39dbc3c3c7e69e87e12977fb173379e60c74a3d9

7 years agoMerge "Fix notification_alert logging" into oc-dev
Julia Reynolds [Thu, 11 May 2017 13:43:38 +0000 (13:43 +0000)]
Merge "Fix notification_alert logging" into oc-dev
am: d82a04664c

Change-Id: I55ea25357f54d335ba4e5e0926cd10062eff06cd

7 years agoAdd an O-release targetAPI check for Canvas.setBitmap.
Derek Sollenberger [Fri, 5 May 2017 19:44:04 +0000 (15:44 -0400)]
Add an O-release targetAPI check for Canvas.setBitmap.

For apps targeting releases earlier than O setBitmap will attempt
to preserve the matrix from the previous bitmap.  It does not however
attempt to reconstruct the save/restore stack or the clip.

Test: manual test of messenger app referenced in the bug
Bug: 37589964
Change-Id: I67f0928a3f84a8be41da38ef1868e79bdeb03e46

7 years agoMerge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev
Jason Monk [Thu, 11 May 2017 13:21:32 +0000 (13:21 +0000)]
Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev

7 years agoMerge "Fix notification_alert logging" into oc-dev
Julia Reynolds [Thu, 11 May 2017 13:03:42 +0000 (13:03 +0000)]
Merge "Fix notification_alert logging" into oc-dev

7 years agoMerge changes Ie762ce75,I611fd791
Hugo Benichi [Thu, 11 May 2017 12:43:42 +0000 (12:43 +0000)]
Merge changes Ie762ce75,I611fd791
am: 21a57f263f

Change-Id: Ibb291720f6c257a8ead2c039f584f4b3ecc69be5

7 years agoMerge changes Ie762ce75,I611fd791
Hugo Benichi [Thu, 11 May 2017 12:31:39 +0000 (12:31 +0000)]
Merge changes Ie762ce75,I611fd791

* changes:
  ConnectivityManager: unit test for argument validation
  ConnectivityManager: uses service error codes and exceptions

7 years agoRemove obsolete DEXOPT_SAFEMODE.
Nicolas Geoffray [Thu, 11 May 2017 12:22:57 +0000 (12:22 +0000)]
Remove obsolete DEXOPT_SAFEMODE.
am: 972b2c236e

Change-Id: Idbcca56b3850d3891a352b98942724637db00f36

7 years agoMerge "Prepare for removal of junit and android.test classes from Android API (step...
Paul Duffin [Thu, 11 May 2017 11:31:28 +0000 (11:31 +0000)]
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE." am: 383b2af3ec am: 10085b3737
Nicolas Geoffray [Thu, 11 May 2017 10:24:13 +0000 (10:24 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am: 383b2af3ec am: 10085b3737
am: 4e3f529c6d

Change-Id: If98007a52a931cbd2d2800e94e02a1b4ecd32f08

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE." am: 383b2af3ec
Nicolas Geoffray [Thu, 11 May 2017 10:10:20 +0000 (10:10 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am: 383b2af3ec
am: 10085b3737

Change-Id: Id05d1cd2d9cb6bd1b9d80b2128b45c4a411951a3

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE."
Nicolas Geoffray [Thu, 11 May 2017 09:59:49 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am: 383b2af3ec

Change-Id: I97ccd9f087366d93495e3aeb8b26780039fd417b

7 years agoMerge "Handle safe mode in PackageManager." into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 09:50:19 +0000 (09:50 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
am: a6a73ff55a

Change-Id: Id85cdfb3d59c25a0df015fc813a2f859b2c23309

7 years agoRemove obsolete DEXOPT_SAFEMODE.
Nicolas Geoffray [Fri, 5 May 2017 13:30:02 +0000 (14:30 +0100)]
Remove obsolete DEXOPT_SAFEMODE.

PackageManager side of the change.

bug:37929796
Test: build
Change-Id: Iae830bb4060b448b4b4e54d3e0fe03ebee39d3fa
(cherry picked from commit 56123bacff220e6ac77a1179197578d3a62ecdd2)

7 years agoMerge "Handle safe mode in PackageManager." into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 09:43:44 +0000 (09:43 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE."
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."