OSDN Git Service
Zheng Zhang [Wed, 19 Apr 2017 23:13:41 +0000 (23:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
86c579678e -s ours" into oc-dev-plus-aosp
am:
3aee91cd80 -s ours
Change-Id: I534ea317ca49024558d24c7397658696fe57a0c3
Lucas Dupin [Wed, 19 Apr 2017 23:08:28 +0000 (23:08 +0000)]
Merge "Internal copy of Palette API." into oc-dev am:
8b4cca11f3
am:
5086a1d005
Change-Id: I4d297f8ec8c68f6c1b8994a2cc7f59b360476419
Sunny Goyal [Wed, 19 Apr 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am:
7790695bf2
am:
fa7cc65529
Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
TreeHugger Robot [Wed, 19 Apr 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Merge commit '
695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c"
TreeHugger Robot [Wed, 19 Apr 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Add implementation alternatives for OemLockManager."
Rubin Xu [Wed, 19 Apr 2017 22:32:51 +0000 (22:32 +0000)]
Merge "Integrate weaver into authentication flow"
Rubin Xu [Fri, 31 Mar 2017 17:03:20 +0000 (18:03 +0100)]
Integrate weaver into authentication flow
Use the weaver applet running inside secure element to enforce
password verification back-off and provide secure deletion.
Bug:
30328567
Test: runtest frameworks-services -c com.android.server.WeaverBasedSyntheticPasswordTests
Test: manually on marlin/secure element with applet/secure element without applet
Change-Id: I376dd9707c90d005e56c85ee79a26fdc428779bf
TreeHugger Robot [Wed, 19 Apr 2017 22:18:52 +0000 (22:18 +0000)]
Merge "Opt out default focus highlight for TV."
TreeHugger Robot [Wed, 19 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Pre-merge hide API for a11y service state"
Robert Greenwalt [Wed, 19 Apr 2017 21:03:30 +0000 (14:03 -0700)]
Merge commit '
695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
Tomasz Wasilczyk [Wed, 19 Apr 2017 20:51:31 +0000 (20:51 +0000)]
Merge "Make RadioService actually talking to the HAL."
TreeHugger Robot [Wed, 19 Apr 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Update user id from shortcut constructor"
Phil Weaver [Wed, 19 Apr 2017 18:40:32 +0000 (11:40 -0700)]
Update user id from shortcut constructor
No functional changes, because the value passed in happens to
be 0, but I noticed that I wasn't properly initializing stuff.
Test: Builds, boots, and I verified that the shortcut still works.
Change-Id: I712c5dc85c674628a66a5cfa9d4c3f7abbfa0129
Android Build Merger (Role) [Wed, 19 Apr 2017 18:39:25 +0000 (18:39 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours am:
86c579678e -s ours" into oc-dev-plus-aosp
Lucas Dupin [Wed, 19 Apr 2017 18:37:41 +0000 (18:37 +0000)]
Merge "Internal copy of Palette API." into oc-dev
am:
8b4cca11f3
Change-Id: Ie4ad73e57ca0b44d87986038874287ca6bab2f6d
Zheng Zhang [Wed, 19 Apr 2017 18:37:35 +0000 (18:37 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours am:
74b8c15d2b -s ours
am:
86c579678e -s ours
Change-Id: Ia4338b4f043d07bbe1f38bbb0d1e86115cf9645d
Sunny Goyal [Wed, 19 Apr 2017 18:33:04 +0000 (18:33 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
am:
7790695bf2
Change-Id: I3520dc3c3a5cbe933894764e2d3f7ac9df11582e
Zheng Zhang [Wed, 19 Apr 2017 18:31:30 +0000 (18:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours
am:
74b8c15d2b -s ours
Change-Id: I8f4523d90480e3b56bf223468ba42157fe6e97eb
Zheng Zhang [Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
am:
5b84ba3b15 -s ours
Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8
Robert Greenwalt [Wed, 19 Apr 2017 18:24:03 +0000 (11:24 -0700)]
Merge commit '
d6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
Tomasz Wasilczyk [Tue, 18 Apr 2017 00:02:06 +0000 (17:02 -0700)]
Make RadioService actually talking to the HAL.
For now, only opening and closing a tuner is implemented.
Test: instrumentation, KitchenSink
Bug: b/
36863239
Change-Id: Ib2e14c0108c0714524d50b9557f24465c68f5ef2
Jeff Hao [Wed, 19 Apr 2017 17:58:40 +0000 (17:58 +0000)]
Merge "Handle shared libraries for split apks." am:
9487dff8ab am:
dae160f51b am:
98f62d8aa0 -s ours
am:
98799bddfb -s ours
Change-Id: Ia69b2ada3a0c6e51ec4742d52d8f76aa616cc6cd
Jiaquan He [Tue, 18 Apr 2017 22:39:59 +0000 (15:39 -0700)]
Opt out default focus highlight for TV.
Test: Checked that the default focus highlight doesn't show on TV.
Bug:
37160940
Change-Id: Id3719ce1aa602ba6792cc94c9fa034670509cda0
Jeff Hao [Wed, 19 Apr 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Handle shared libraries for split apks." am:
9487dff8ab am:
dae160f51b
am:
98f62d8aa0 -s ours
Change-Id: I014165037e367e1012a21e288f21194f5036585a
Jeff Hao [Wed, 19 Apr 2017 17:30:06 +0000 (17:30 +0000)]
Merge "Handle shared libraries for split apks." am:
9487dff8ab
am:
dae160f51b
Change-Id: I3b8fd7be7bf987858df229cfd95ca8d4dc170b54
TreeHugger Robot [Wed, 19 Apr 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Internal copy of Palette API." into oc-dev
Jeff Hao [Wed, 19 Apr 2017 17:21:36 +0000 (17:21 +0000)]
Merge "Handle shared libraries for split apks."
am:
9487dff8ab
Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."
Sunny Goyal [Wed, 19 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
Robert Greenwalt [Wed, 19 Apr 2017 17:09:30 +0000 (17:09 +0000)]
Merge "Mark Restricted APN connections as restricted." into oc-dev
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.
Bug:
37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e
Jaewan Kim [Wed, 19 Apr 2017 16:56:00 +0000 (16:56 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev am:
3d5f41bb03
am:
5170ae7638
Change-Id: Ibdd616ad192fb72cdce2a8be1b56efb2601e1eb8
Jaewan Kim [Wed, 19 Apr 2017 16:49:54 +0000 (16:49 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev
am:
3d5f41bb03
Change-Id: I136548911db0faf018fef046a0a81323c45479de
Tao Bao [Wed, 19 Apr 2017 16:44:24 +0000 (16:44 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev am:
a532f4d7f8
am:
9da2190238
Change-Id: Ic99e657d13ee7a6390aa1af57ce3b85925e953be
TreeHugger Robot [Wed, 19 Apr 2017 16:42:38 +0000 (16:42 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:38:58 +0000 (16:38 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
am:
a532f4d7f8
Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32
Tao Bao [Wed, 19 Apr 2017 16:30:22 +0000 (16:30 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
Jakub Pawlowski [Wed, 19 Apr 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am:
7826c08e21 am:
0c9c0969cc am:
8359e191ae
am:
cf990de525
Change-Id: I0ea7e4b4231a0eacbe3d5803debf3d2571690166
Jakub Pawlowski [Wed, 19 Apr 2017 16:20:37 +0000 (16:20 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am:
7826c08e21 am:
0c9c0969cc
am:
8359e191ae
Change-Id: I435d7755d39068730089764916de56b23411cc49
Keun-young Park [Wed, 19 Apr 2017 16:20:16 +0000 (16:20 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev am:
f04390ed49
am:
c5c30239d6
Change-Id: Ide5358102ff89310fbf987fc67f38104acd304be
Keun-young Park [Wed, 19 Apr 2017 16:16:54 +0000 (16:16 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
am:
f04390ed49
Change-Id: I6c1a80a4a74e44973f08cefe7c7e392ea6e109a6
Jakub Pawlowski [Wed, 19 Apr 2017 16:13:50 +0000 (16:13 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am:
7826c08e21
am:
0c9c0969cc
Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
Keun-young Park [Wed, 19 Apr 2017 16:12:02 +0000 (16:12 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:10:20 +0000 (16:10 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev am:
e3872a4fc9
am:
a9fd199fdd
Change-Id: I65c9418a651dd66f274ab6e331185731be10e8ea
Tao Bao [Wed, 19 Apr 2017 16:05:25 +0000 (16:05 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
am:
e3872a4fc9
Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f
Jakub Pawlowski [Wed, 19 Apr 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
am:
7826c08e21
Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807
Tao Bao [Wed, 19 Apr 2017 15:54:18 +0000 (15:54 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
Andrew Scull [Wed, 12 Apr 2017 10:46:27 +0000 (11:46 +0100)]
Add implementation alternatives for OemLockManager.
The OEM lock can be implemented with the persistent data block or the
OemLock HAL.
Test: gts-tradefed run gts -m GtsOemLockServiceTestCases -t com.google.android.oemlock.gts.OemLockServiceTest
Bug:
34766843
Change-Id: I16b31785d9af58212a050a299ef024be3139f0c6
Julia Reynolds [Wed, 19 Apr 2017 13:57:19 +0000 (13:57 +0000)]
Merge changes I1d00d86e,I16d81113 into oc-dev am:
f9db6d3b5f
am:
815388af6c
Change-Id: I8d58a312a5340762a15e1a97f441f08169c85935
Julia Reynolds [Wed, 19 Apr 2017 13:56:18 +0000 (13:56 +0000)]
Merge "Don't clear snoozed components on restore." into oc-dev am:
f1c7b9e121
am:
1ca91b15ba
Change-Id: I231572aca47fd417e281966e2c2ec510185d80d7
Julia Reynolds [Wed, 19 Apr 2017 13:51:21 +0000 (13:51 +0000)]
Merge changes I1d00d86e,I16d81113 into oc-dev
am:
f9db6d3b5f
Change-Id: Ie149b783953ec29ca8867261c852c6e429b004bb
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:45:02 +0000 (13:45 +0000)]
Merge changes I1d00d86e,I16d81113 into oc-dev
* changes:
Silence non-clickable imagebutton
Remove log spam
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:37:02 +0000 (09:37 +0000)]
Merge "Redesign of QSSecurityFooter" into oc-dev am:
a017e573b5
am:
457cec0861
Change-Id: Ib0a23d87994e2ded25e3e317771421d410e5dc58
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:11:01 +0000 (08:11 +0000)]
Merge "Binder: Log details of pending exception." into oc-dev am:
dc51eedd1f
am:
c0e5ef1538
Change-Id: I94737cd37c20fc4ff37a0227fc2e49456ad03288
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
Artem Iglikov [Wed, 19 Apr 2017 07:57:33 +0000 (07:57 +0000)]
Merge "Don't back up disabled apps."
Treehugger Robot [Wed, 19 Apr 2017 06:08:48 +0000 (06:08 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
Jaewan Kim [Wed, 29 Mar 2017 18:22:03 +0000 (03:22 +0900)]
MediaSessionService: Nullify the media button sesison when it's removed
When the media button sesison is removed, we'd better not pick the
alternative media button session within the app because the alternative
media session might be a dummy which isn't able to handle media keys.
Test: Run the CtsMediaTest (MediaSessionTest and MediaSessionManagerTest)
and the manual test (Launch a media app which creates two media
sessions, and confirmed that another media session doesn't become the
media button session when the media button session is removed)
Change-Id: I376a34ee4b5d2344007594134c40b135b2c5a1bf
Felipe Leme [Wed, 19 Apr 2017 05:18:57 +0000 (05:18 +0000)]
Merge "Some Autofill API changes." into oc-dev am:
fe1bddfbb5
am:
a4d2749cf8
Change-Id: I460229f5bf0c4fc832256e00746a813fd08991ea
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
Keun-young Park [Mon, 17 Apr 2017 23:17:28 +0000 (16:17 -0700)]
fs_stat: ignore quota fix caused by tree optimization
- tree optimization leads into quota fix which is not a real fix.
- Distinguish such case from real file system fix to get fs statistics
correctly.
- This is only for correct fs stat metric collection. There is no
functionality change in device side.
- Full parsing is only run when fs fix is detected from fs_stat.
Examplt of fsck fix that will be ignored as optimization:
e2fsck 1.43.3 (04-Sep-2016)
Pass 1: Checking inodes, blocks, and sizes
Inode 877141 extent tree (at level 1) could be shorter. Fix? yes
Pass 1E: Optimizing extent trees
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
[QUOTA WARNING] Usage inconsistent for ID 10038:actual (
71667712, 1000) != expected (
71671808, 1000)
Update quota info for quota type 0? yes
[QUOTA WARNING] Usage inconsistent for ID 10038:actual (
59555840, 953) != expected (
59559936, 953)
Update quota info for quota type 1? yes
/dev/block/platform/soc/624000.ufshc/by-name/userdata: ***** FILE SYSTEM WAS MODIFIED *****
- also added unit test for the fsck log parsing
bug:
36391645
Test: many reboots with fs_stat check, runtest frameworks-services -c com.android.server.BootReceiverFixFsckFsStatTest
Change-Id: I86a97a3b50ee573db51d19d2cd243b8f7795a165
Lucas Dupin [Wed, 19 Apr 2017 03:29:45 +0000 (03:29 +0000)]
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev am:
9cd92959e6
am:
9169df47c5
Change-Id: I52ee3b55f0e6e7735738ec1ac07dd0e44d04124d
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 03:06:36 +0000 (03:06 +0000)]
Merge "Address API council comments" into oc-dev am:
57ed0ba69d
am:
dca67a7f48
Change-Id: I991a268bf1dfc908249c3114802ea0cc2b567c63
Sunny Goyal [Wed, 19 Apr 2017 03:03:37 +0000 (03:03 +0000)]
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev am:
15b48ff4de
am:
cdb51ebb41
Change-Id: If4ee1ff513c4f52b102a9252c99e813d783f6d1d
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
Philip P. Moltmann [Wed, 19 Apr 2017 02:56:07 +0000 (02:56 +0000)]
Merge "Add a way to read the last AutofillSelection." into oc-dev am:
42775f2a89
am:
ded76ed806
Change-Id: I8cf4a959e9d60bd15c61955a802115904a2baead
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:46:47 +0000 (01:46 +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
am:
3c68867864
Change-Id: I3233a604cda1ca48fad524b5c02d54847d67cfc0
Todd Kennedy [Wed, 19 Apr 2017 01:45:37 +0000 (01:45 +0000)]
Merge "update docs per API council" into oc-dev am:
e28cccab24
am:
62fc9fd7e7
Change-Id: I187df43e72344e73e1c3d9572a3d692a284ca51b
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:40:08 +0000 (01:40 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev am:
982ce6402b
am:
4579de825b
Change-Id: I39f43d447924f939f412ded405b6de86553f4e9b
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 01:06:23 +0000 (01:06 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev am:
fca728da6c
am:
32a7954315
Change-Id: I0be0f0930226a99bdc6d0fc3403836a329cda5be
Chen Xu [Wed, 19 Apr 2017 01:02:14 +0000 (01:02 +0000)]
Merge "better defualt behaviour for msim" into oc-dev am:
7358ebeedd
am:
23d5da6a5d
Change-Id: If8cdd98760d2e0e142e7374aaa5ff6de75a498b9
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
Nathan Harold [Wed, 19 Apr 2017 00:56:49 +0000 (00:56 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev am:
01307a7e94 -s ours
am:
2ee16570ec
Change-Id: I6c70846cb8b8dbe80aacce8cd9aa80e61a406acb
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
Winson Chung [Wed, 19 Apr 2017 00:35:01 +0000 (00:35 +0000)]
Merge "Update Overview content descriptions." into oc-dev am:
aede8d6226
am:
3b56b48ac3
Change-Id: I480e5a970d37b6166bf0a753d6a20011c2d62d2f
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