OSDN Git Service
Abodunrinwa Toki [Wed, 19 Apr 2017 19:25:10 +0000 (19:25 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
am:
ef0512a87a
Change-Id: Ibe0a7a52ab7122d720fc95f1dd6d8fe8d45c9a50
TreeHugger Robot [Wed, 19 Apr 2017 19:20:39 +0000 (19:20 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
George Mount [Wed, 19 Apr 2017 19:14:08 +0000 (19:14 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
am:
681ff5c7d8
Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4
Wei Wang [Wed, 19 Apr 2017 19:11:02 +0000 (19:11 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
am:
b1f7358d98
Change-Id: I611cfae89e9d9e2be740cd8c130bf57bcf4cca11
TreeHugger Robot [Wed, 19 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
Mady Mellor [Wed, 19 Apr 2017 19:00:49 +0000 (19:00 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
am:
043ae355e9
Change-Id: I0f7d6ba47b6bacd2002a97b89b5c2bf5102ae9e7
Mady Mellor [Wed, 19 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
am:
c1d9cdfe79
Change-Id: I1bb219553b05f87d4dce8ae2d43aa2fd80486bb1
Zheng Zhang [Wed, 19 Apr 2017 18:56:57 +0000 (18:56 +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:
9996f8589d -s ours
Change-Id: I743cd5c400a4c4a43938621349a6a7917d2deaaf
Android Build Merger (Role) [Wed, 19 Apr 2017 18:54:25 +0000 (18:54 +0000)]
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am:
f3ff7b8207" into oc-dev-plus-aosp
George Mount [Wed, 19 Apr 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
am:
f3ff7b8207
Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f
Android Build Merger (Role) [Wed, 19 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am:
d1a1c8004e" into oc-dev-plus-aosp
Winson Chung [Wed, 19 Apr 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
am:
d1a1c8004e
Change-Id: Ia94a684ca81bd50dd4cb51ebb816c4ac99f24a89
Android Build Merger (Role) [Wed, 19 Apr 2017 18:48:28 +0000 (18:48 +0000)]
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am:
f4c31bf67b" into oc-dev-plus-aosp
Evan Rosky [Wed, 19 Apr 2017 18:47:10 +0000 (18:47 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev
am:
f4c31bf67b
Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9
Android Build Merger (Role) [Wed, 19 Apr 2017 18:45:29 +0000 (18:45 +0000)]
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am:
e262cc234b" into oc-dev-plus-aosp
Jason Monk [Wed, 19 Apr 2017 18:44:48 +0000 (18:44 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev
am:
e262cc234b
Change-Id: I98a6e0ff1df55d3f6804869d40abe23aa2b7686e
Android Build Merger (Role) [Wed, 19 Apr 2017 18:44:19 +0000 (18:44 +0000)]
Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am:
4132f86041" into oc-dev-plus-aosp
Yohei Yukawa [Wed, 19 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev
am:
4132f86041
Change-Id: Ibb27f00525d08a45d41b8b345a4644be4ced2dbe
Android Build Merger (Role) [Wed, 19 Apr 2017 18:43:02 +0000 (18:43 +0000)]
Merge "Merge "Add missing services to incident_report" into oc-dev am:
f431ea56e1" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 19 Apr 2017 18:42:31 +0000 (18:42 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
Makoto Onuki [Wed, 19 Apr 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Add missing services to incident_report" into oc-dev
am:
f431ea56e1
Change-Id: I87237a2a5108aae2e2402c74217ec5adc27306f1
TreeHugger Robot [Wed, 19 Apr 2017 18:41:44 +0000 (18:41 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
Android Build Merger (Role) [Wed, 19 Apr 2017 18:41:46 +0000 (18:41 +0000)]
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am:
83c9413b75" into oc-dev-plus-aosp
Adam Lesinski [Wed, 19 Apr 2017 18:41:00 +0000 (18:41 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
am:
83c9413b75
Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1
Android Build Merger (Role) [Wed, 19 Apr 2017 18:40:39 +0000 (18:40 +0000)]
Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am:
26e1d91939" into oc-dev-plus-aosp
Adam Lesinski [Wed, 19 Apr 2017 18:39:46 +0000 (18:39 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev
am:
26e1d91939
Change-Id: I1c2ddb6f4d88b30f04fa23caeb60799fbee255cf
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:32:55 +0000 (18:32 +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: I4e023353faf1cbded69661da7013785bd130297c
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
TreeHugger Robot [Wed, 19 Apr 2017 18:15:31 +0000 (18:15 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
Winson Chung [Wed, 19 Apr 2017 18:10:16 +0000 (18:10 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
Evan Rosky [Wed, 19 Apr 2017 18:08:23 +0000 (18:08 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev
Jason Monk [Wed, 19 Apr 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev
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
Yohei Yukawa [Wed, 19 Apr 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Add missing services to incident_report" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:25 +0000 (17:32 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:02 +0000 (17:32 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev
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: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
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: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: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: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
Jason Monk [Wed, 19 Apr 2017 14:49:37 +0000 (10:49 -0400)]
Swap back content alphas for light and dark.
Someone may have accidentally switched them...
Change-Id: If9039398548a7ce9d7f38941ba774a05e8bedcb8
Fixes:
37483431
Test: visual
George Mount [Wed, 19 Apr 2017 14:29:45 +0000 (07:29 -0700)]
Fix FragmentTransaction.show() to show the fragment.
Bug
37413327
When there was an animation and the fragment transaction wasn't
optimized, the fragment visiiblity wasn't being set during show().
Test: I0fd4029a02d6c9f082011bf56f0d3c8245803f68
Change-Id: Idc2c74ae2fc4759a755a5988ce6ca1b39ef8d554
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
Abodunrinwa Toki [Thu, 13 Apr 2017 08:56:52 +0000 (09:56 +0100)]
TextClassifierImpl: Fix empty locale list issue.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
37289966
Change-Id: Ib822f2cc2fbaeb67dcc06e1f9fea306ee1c8c9ef
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
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: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: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
Winson Chung [Wed, 19 Apr 2017 02:01:40 +0000 (19:01 -0700)]
Adding consistent platform PiP action asset.
Bug:
36782878
Test: This is just an asset
Change-Id: I43fdafcc8d2626d5fe0c61935ff09137ad0d6e0a
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
OSDN Git Service
