Abodunrinwa Toki
a98659942a
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
...
am: ef0512a87a
Change-Id: Ibe0a7a52ab7122d720fc95f1dd6d8fe8d45c9a50
2017-04-19 19:25:10 +00:00
TreeHugger Robot
ef0512a87a
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
2017-04-19 19:20:43 +00:00
George Mount
300a24c282
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
...
am: 681ff5c7d8
Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4
2017-04-19 19:14:08 +00:00
TreeHugger Robot
681ff5c7d8
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
2017-04-19 19:06:09 +00:00
George Mount
defb888aac
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
...
am: f3ff7b8207
Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f
2017-04-19 18:53:02 +00:00
Evan Rosky
fdac44dc74
Merge "Handle edge-case where no focusables exist" into oc-dev
...
am: f4c31bf67b
Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9
2017-04-19 18:47:10 +00:00
Adam Lesinski
cb81f508cc
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
...
am: 83c9413b75
Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1
2017-04-19 18:41:00 +00:00
Lucas Dupin
5086a1d005
Merge "Internal copy of Palette API." into oc-dev
...
am: 8b4cca11f3
Change-Id: Ie4ad73e57ca0b44d87986038874287ca6bab2f6d
2017-04-19 18:37:41 +00:00
Sunny Goyal
fa7cc65529
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
...
am: 7790695bf2
Change-Id: I3520dc3c3a5cbe933894764e2d3f7ac9df11582e
2017-04-19 18:33:04 +00:00
Robert Greenwalt
695d2c6df1
Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
...
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
2017-04-19 11:24:03 -07:00
TreeHugger Robot
f3ff7b8207
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
2017-04-19 18:15:36 +00:00
Evan Rosky
f4c31bf67b
Merge "Handle edge-case where no focusables exist" into oc-dev
2017-04-19 18:08:29 +00:00
TreeHugger Robot
83c9413b75
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
2017-04-19 17:32:30 +00:00
TreeHugger Robot
8b4cca11f3
Merge "Internal copy of Palette API." into oc-dev
2017-04-19 17:24:07 +00:00
Sunny Goyal
7790695bf2
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
2017-04-19 17:10:42 +00:00
Robert Greenwalt
d6c9efa332
Merge "Mark Restricted APN connections as restricted." into oc-dev
2017-04-19 17:09:35 +00:00
Tao Bao
9da2190238
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
...
am: a532f4d7f8
Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32
2017-04-19 16:38:58 +00:00
Tao Bao
a532f4d7f8
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
2017-04-19 16:30:28 +00:00
Jakub Pawlowski
cf990de525
Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21 am: 0c9c0969cc
...
am: 8359e191ae
Change-Id: I435d7755d39068730089764916de56b23411cc49
2017-04-19 16:20:37 +00:00
Keun-young Park
c5c30239d6
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
...
am: f04390ed49
Change-Id: I6c1a80a4a74e44973f08cefe7c7e392ea6e109a6
2017-04-19 16:16:54 +00:00
Jakub Pawlowski
8359e191ae
Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
...
am: 0c9c0969cc
Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
2017-04-19 16:13:50 +00:00
Keun-young Park
f04390ed49
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
2017-04-19 16:12:08 +00:00
Tao Bao
a9fd199fdd
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
...
am: e3872a4fc9
Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f
2017-04-19 16:05:25 +00:00
Tao Bao
e3872a4fc9
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
2017-04-19 15:54:24 +00:00
George Mount
c5828b50ed
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
2017-04-19 07:32:36 -07:00
Abodunrinwa Toki
a2df6e5415
TextClassifierImpl: Fix empty locale list issue.
...
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 37289966
Change-Id: Ib822f2cc2fbaeb67dcc06e1f9fea306ee1c8c9ef
2017-04-19 13:52:12 +01:00
Felipe Leme
a4d2749cf8
Merge "Some Autofill API changes." into oc-dev
...
am: fe1bddfbb5
Change-Id: I682065cd5fcfb2de9639874705fefdeaed06d343
2017-04-19 05:13:19 +00:00
Felipe Leme
fe1bddfbb5
Merge "Some Autofill API changes." into oc-dev
2017-04-19 05:05:48 +00:00
Keun-young Park
6bea235195
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
2017-04-18 21:39:05 -07:00
Lucas Dupin
9169df47c5
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
...
am: 9cd92959e6
Change-Id: Ib71474073088c9098652f1f1a792aab615676cd9
2017-04-19 03:24:40 +00:00
TreeHugger Robot
9cd92959e6
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
2017-04-19 03:17:50 +00:00
Svetoslav Ganov
dca67a7f48
Merge "Address API council comments" into oc-dev
...
am: 57ed0ba69d
Change-Id: I28253a456f288da02506367a2b9039cffb1d0a25
2017-04-19 02:56:39 +00:00
Sunny Goyal
cdb51ebb41
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
...
am: 15b48ff4de
Change-Id: Ifce032deebbe1dd66d4e80dd211030765daab4a0
2017-04-19 02:53:05 +00:00
Philip P. Moltmann
ded76ed806
Merge "Add a way to read the last AutofillSelection." into oc-dev
...
am: 42775f2a89
Change-Id: I6be640dc4bf6ceba6889c59a4e464540f3834e6e
2017-04-19 02:50:01 +00:00
Svetoslav Ganov
57ed0ba69d
Merge "Address API council comments" into oc-dev
2017-04-19 02:44:18 +00:00
TreeHugger Robot
15b48ff4de
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
2017-04-19 02:43:47 +00:00
TreeHugger Robot
42775f2a89
Merge "Add a way to read the last AutofillSelection." into oc-dev
2017-04-19 02:43:08 +00:00
Felipe Leme
e5f9c30688
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
2017-04-18 19:27:58 -07:00
Todd Kennedy
62fc9fd7e7
Merge "update docs per API council" into oc-dev
...
am: e28cccab24
Change-Id: I156e1547adab002afee19bacbd13808936a48775
2017-04-19 01:40:36 +00:00
TreeHugger Robot
e28cccab24
Merge "update docs per API council" into oc-dev
2017-04-19 01:31:46 +00:00
Nathan Harold
fca728da6c
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
2017-04-19 00:36:21 +00:00
Nathan Harold
01307a7e94
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
2017-04-19 00:34:24 +00:00
Felipe Leme
0f3a9cf166
Merge "Clone autofill service settings on managed profile." into oc-dev
...
am: fad9b07e31
Change-Id: I0c65659302047536a2b2b594cdb90e1aa05b4621
2017-04-19 00:28:27 +00:00
TreeHugger Robot
fad9b07e31
Merge "Clone autofill service settings on managed profile." into oc-dev
2017-04-19 00:20:09 +00:00
Philip P. Moltmann
cc684ed41f
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
2017-04-18 16:59:40 -07:00
Adam Lesinski
ec05bc0fda
Fix issue with fontScale changes not taking effect
...
If a configuration change occurs, and an underlying ResourcesImpl is
swapped out under a Resources object, the DisplayMetrics cached by
TypedArray will be stale and not up-to-date.
Bug: 34120637
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerConfigChangeTests
Change-Id: Id78a6d259250950387c2e95c4a2292fdd095c7af
2017-04-18 16:58:18 -07:00
Torne (Richard Coles)
061f809ae2
Merge "Add logging to WebView zygote package preload." into oc-dev
...
am: 4396a74208
Change-Id: Ia2253843589ccb740706a8659b962c0da125d097
2017-04-18 23:51:57 +00:00
Svetoslav Ganov
0cb43ef67b
Address API council comments
...
Test: all static shared lib CTS tests pass
bug:37327970
Change-Id: Ie8c4d853da5fa0a6125b9def38831860f79ce53d
2017-04-18 16:44:28 -07:00
Chris Wren
6d3f008fee
Merge "guard against nulls in LogMaker" into oc-dev
...
am: ddf1d16504
Change-Id: Ife617e3f96339a411416f48ab84ea72a992d2b75
2017-04-18 23:43:50 +00:00
TreeHugger Robot
4396a74208
Merge "Add logging to WebView zygote package preload." into oc-dev
2017-04-18 23:43:25 +00:00