OSDN Git Service
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
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
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
Robert Greenwalt [Wed, 19 Apr 2017 18:24:03 +0000 (11:24 -0700)]
Merge commit '
d6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
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
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
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
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: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
Yu Liu [Wed, 19 Apr 2017 01:41:51 +0000 (01:41 +0000)]
Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG:
36552859" into oc-dev
am:
500c1d0749
Change-Id: I1ca9beace45f80962d3992c27724e6d281972524
Todd Kennedy [Wed, 19 Apr 2017 01:40:36 +0000 (01:40 +0000)]
Merge "update docs per API council" into oc-dev
am:
e28cccab24
Change-Id: I156e1547adab002afee19bacbd13808936a48775
Winson Chung [Wed, 19 Apr 2017 01:34:40 +0000 (01:34 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
am:
982ce6402b
Change-Id: Ic8c30fa320022bfc5233738f13f45bb4b30bb4e3
Yu Liu [Wed, 19 Apr 2017 01:33:04 +0000 (01:33 +0000)]
Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG:
36552859" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:31:41 +0000 (01:31 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:29:10 +0000 (01:29 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
* changes:
Add remaining default media icons.
Disable PiP when a task is locked.
Fix issue with PiP actions flashing.
Nathan Harold [Wed, 19 Apr 2017 00:58:26 +0000 (00:58 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
am:
fca728da6c
Change-Id: I64e9e5076b26562f3faaad8fb1a201d0933e8f50
Chen Xu [Wed, 19 Apr 2017 00:55:11 +0000 (00:55 +0000)]
Merge "better defualt behaviour for msim" into oc-dev
am:
7358ebeedd
Change-Id: Id8fd96ae871c510972f70450224b5ab2e20f27da
Nathan Harold [Wed, 19 Apr 2017 00:52:35 +0000 (00:52 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
am:
01307a7e94 -s ours
Change-Id: Id6b155b29ef23961b4c3303a2f35d1701c9f8478
Nathan Harold [Wed, 19 Apr 2017 00:36:16 +0000 (00:36 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
Chen Xu [Wed, 19 Apr 2017 00:34:52 +0000 (00:34 +0000)]
Merge "better defualt behaviour for msim" into oc-dev
Nathan Harold [Wed, 19 Apr 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
Winson Chung [Wed, 19 Apr 2017 00:29:39 +0000 (00:29 +0000)]
Merge "Update Overview content descriptions." into oc-dev
am:
aede8d6226
Change-Id: I15402dfe79d4bbdd43a95d3fdb7a3b2d7295a3ad
Felipe Leme [Wed, 19 Apr 2017 00:28:27 +0000 (00:28 +0000)]
Merge "Clone autofill service settings on managed profile." into oc-dev
am:
fad9b07e31
Change-Id: I0c65659302047536a2b2b594cdb90e1aa05b4621
Winson Chung [Wed, 19 Apr 2017 00:22:35 +0000 (00:22 +0000)]
Merge "Update Overview content descriptions." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 00:20:05 +0000 (00:20 +0000)]
Merge "Clone autofill service settings on managed profile." into oc-dev
Jaewan Kim [Wed, 19 Apr 2017 00:18:12 +0000 (00:18 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde am:
16e5c08cbd
am:
fcb86793a6 -s ours
Change-Id: Iccbaef08a79790e645b9b520608d215f255ebf9e
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.
As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I73823ca575560cbd445d78a6cfbfc72031943265
(cherry-picked from commit
16d4843433e024100b4ecd183f827ad5bd8772a6)
Change-Id: I943bf8234899e1b25d4eb5e98af15d9150a7a842
Philip P. Moltmann [Mon, 17 Apr 2017 21:18:33 +0000 (14:18 -0700)]
Add a way to read the last AutofillSelection.
- Check UID to make sure one service cannot read FillSelections of other
services
- Add id to Dataset to allow to tag the datasets. This id is then found
in the FillSelection.Event
- Add clientState to FillSelection to allow service to store more data
Fixes:
36871500
Test: CtsAutoFillServiceTestCases
Change-Id: Ice894245508227265294a1c59ea97842175e5aec
Torne (Richard Coles) [Tue, 18 Apr 2017 23:51:57 +0000 (23:51 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev
am:
4396a74208
Change-Id: Ia2253843589ccb740706a8659b962c0da125d097
Svetoslav Ganov [Tue, 18 Apr 2017 21:28:35 +0000 (14:28 -0700)]
Address API council comments
Test: all static shared lib CTS tests pass
bug:
37327970
Change-Id: Ie8c4d853da5fa0a6125b9def38831860f79ce53d
Chris Wren [Tue, 18 Apr 2017 23:43:50 +0000 (23:43 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev
am:
ddf1d16504
Change-Id: Ife617e3f96339a411416f48ab84ea72a992d2b75
TreeHugger Robot [Tue, 18 Apr 2017 23:43:21 +0000 (23:43 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev
Jaewan Kim [Tue, 18 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde
am:
16e5c08cbd
Change-Id: Ie38c7ea468285625a6a0e88d5abfe43bb977b504
Jaewan Kim [Tue, 18 Apr 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add callback for AVRCP 1.6 support"
am:
58b5789cde
Change-Id: I13633358bb5fbc0bb52808d2e9213434cc27546f
Romain Guy [Tue, 18 Apr 2017 23:36:46 +0000 (23:36 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev
am:
944782fac2
Change-Id: Ia2dd8c4457bdbd41afb43f5648fa96d1a7a48623
Sunny Goyal [Wed, 12 Apr 2017 22:36:42 +0000 (15:36 -0700)]
Creating a common class for loading drawables and handling various badging
Test: Manually tested on device
Bug:
36591157
Change-Id: Ic847537d416650015cecaeb68f47f7f032e0dbaa
TreeHugger Robot [Tue, 18 Apr 2017 23:32:02 +0000 (23:32 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev
Todd Kennedy [Mon, 17 Apr 2017 22:29:46 +0000 (15:29 -0700)]
update docs per API council
Change-Id: Id32be4db7671d3ef99e155f5fc2f3946eac707dd
Fixes:
37322490
Test: treehugger
TreeHugger Robot [Tue, 18 Apr 2017 23:25:53 +0000 (23:25 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
Winson Chung [Tue, 18 Apr 2017 22:05:31 +0000 (15:05 -0700)]
Add remaining default media icons.
- Fix issue where strings were only in overlay and not in base resources
Bug:
36778575
Test: Launch PiP activity with media session, ensure actions show
Change-Id: I062b6c37ff4789bf375670e8ce872f28c578ffca
Eugene Susla [Tue, 18 Apr 2017 23:19:36 +0000 (23:19 +0000)]
Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev
am:
1888f63434
Change-Id: Id8ba012f7aec5abedbbb45a262c19102541bef99
Dan Sandler [Tue, 18 Apr 2017 23:14:32 +0000 (23:14 +0000)]
Merge "Part of global strings change from cellular > mobile." into oc-dev
am:
52fc775091
Change-Id: I07e4318368ffa60d99b4a0b7db501cb0e4615b4e
TreeHugger Robot [Tue, 18 Apr 2017 23:12:35 +0000 (23:12 +0000)]
Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev
Yu Liu [Tue, 18 Apr 2017 23:08:29 +0000 (16:08 -0700)]
Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council
Test: Existing unit tests still pass.
BUG:
36552859
Change-Id: Ib4cdcef90be3d5b3be329dd780bcb40275b89ef4
TreeHugger Robot [Tue, 18 Apr 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Part of global strings change from cellular —> mobile." into oc-dev
Evan Rosky [Tue, 18 Apr 2017 22:59:16 +0000 (22:59 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev
am:
7906d47f69
Change-Id: Ia626e2b34e739ce11d730c44b081e5b5424df0bd
Tao Bao [Tue, 18 Apr 2017 22:53:40 +0000 (15:53 -0700)]
RecoverySystem: Enable the package compatibility verification.
Hook up to android.os.VintfObject.verify().
Bug:
36592877
Test: Flash on marlin; verify with package that has and doesn't have
compatibility.zip entry.
Change-Id: I4e73fa42f4e3fd2e1c5ffec2ffa6152538d62eee
Evan Rosky [Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev
Philip P. Moltmann [Tue, 18 Apr 2017 22:37:12 +0000 (22:37 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
am:
7fa4198ab1
Change-Id: I27fd5421f329fb0bce97334e3388a956984b3d16
Philip P. Moltmann [Tue, 18 Apr 2017 22:28:13 +0000 (22:28 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
Felipe Leme [Tue, 18 Apr 2017 22:27:32 +0000 (22:27 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev
am:
461fd10d6a
Change-Id: Ide1dc0428c0bcc4acc6714eb75de5880a71f237d
Todd Kennedy [Tue, 18 Apr 2017 22:26:22 +0000 (22:26 +0000)]
Merge "update docs per API council" into oc-dev
am:
43b814b1d2
Change-Id: Ia91175538175bd9fdb98fb13151856e8d5f2e395
Chris Craik [Tue, 18 Apr 2017 22:18:32 +0000 (22:18 +0000)]
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
am:
0f9f0f90e7
Change-Id: I9ed9b1d27c28aef19553721266cb531ac410c175
TreeHugger Robot [Tue, 18 Apr 2017 22:15:13 +0000 (22:15 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev
Felipe Leme [Tue, 18 Apr 2017 21:54:33 +0000 (14:54 -0700)]
Clone autofill service settings on managed profile.
Test: manual verification
Change-Id: I9d13e4230265b18444bfd30fd403c5fb98b88159
Fixes:
37351722
nharold [Tue, 18 Apr 2017 22:12:54 +0000 (22:12 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf am:
8508bc52d2
am:
6eab2ee093
Change-Id: Iaa713ba4b20bab12331bd996288ed2440c349db2
Nathan Harold [Tue, 18 Apr 2017 22:11:18 +0000 (22:11 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532 am:
5db180bbb7
am:
7883c5d460
Change-Id: I04198299d43da4c9c91f705acc5520f734ad9249
TreeHugger Robot [Tue, 18 Apr 2017 22:09:25 +0000 (22:09 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:05:30 +0000 (22:05 +0000)]
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
nharold [Tue, 18 Apr 2017 22:02:48 +0000 (22:02 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf
am:
8508bc52d2
Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
Nathan Harold [Tue, 18 Apr 2017 22:01:32 +0000 (22:01 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532
am:
5db180bbb7
Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
Winson Chung [Tue, 18 Apr 2017 21:52:36 +0000 (14:52 -0700)]
Disable PiP when a task is locked.
Bug:
37135610
Test: Start PiP, enable screen pinning, ensure that PiP is dismissed.
Change-Id: Ie5165364db891b13dd4ef282089f915fe9f99615
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am:
fe358c6adf
Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b
OSDN Git Service
