Commit Graph

69990 Commits

Author SHA1 Message Date
Philip P. Moltmann
e43fe0af9d Merge "Add a way to read the last AutofillSelection." into oc-dev am: 42775f2a89
am: ded76ed806

Change-Id: I8cf4a959e9d60bd15c61955a802115904a2baead
2017-04-19 02:56:07 +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
TreeHugger Robot
42775f2a89 Merge "Add a way to read the last AutofillSelection." into oc-dev 2017-04-19 02:43:08 +00:00
Todd Kennedy
f84fedf2d4 Merge "update docs per API council" into oc-dev am: e28cccab24
am: 62fc9fd7e7

Change-Id: I187df43e72344e73e1c3d9572a3d692a284ca51b
2017-04-19 01:45:37 +00: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
8a7b06d865 Merge "Clone autofill service settings on managed profile." into oc-dev am: fad9b07e31
am: 0f3a9cf166

Change-Id: I24535dee497b3a4c0e7247f0cf5bb3e6054f62f0
2017-04-19 00:33:58 +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
Chris Wren
6b110a203e Merge "guard against nulls in LogMaker" into oc-dev am: ddf1d16504
am: 6d3f008fee

Change-Id: Ide8584d39bc7dc6c7cafa085d09d9f908ad24c72
2017-04-18 23:49:54 +00: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
ddf1d16504 Merge "guard against nulls in LogMaker" into oc-dev 2017-04-18 23:32:09 +00:00
Todd Kennedy
9732f935dc update docs per API council
Change-Id: Id32be4db7671d3ef99e155f5fc2f3946eac707dd
Fixes: 37322490
Test: treehugger
2017-04-18 16:29:46 -07:00
Evan Rosky
e01b955c27 Merge "Ignore nested keyboard navigation clusters" into oc-dev am: 7906d47f69
am: 9e140d9c91

Change-Id: Id8d414b684a576f288288aa439c15f3e59646889
2017-04-18 23:12:10 +00:00
Evan Rosky
9e140d9c91 Merge "Ignore nested keyboard navigation clusters" into oc-dev
am: 7906d47f69

Change-Id: Ia626e2b34e739ce11d730c44b081e5b5424df0bd
2017-04-18 22:59:16 +00:00
Evan Rosky
7906d47f69 Merge "Ignore nested keyboard navigation clusters" into oc-dev 2017-04-18 22:54:08 +00:00
Philip P. Moltmann
d8abd91dfc Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev am: 7fa4198ab1
am: 251657696b

Change-Id: I475cbfe11a4ca10fe4c7d4da9d617c0ed7d15f7e
2017-04-18 22:45:55 +00:00
Todd Kennedy
cf81c43f4a Merge "update docs per API council" into oc-dev am: 43b814b1d2
am: 1b92db197c

Change-Id: Ia61e492ebf4fc5b798f515c24df93961e6e80da5
2017-04-18 22:43:35 +00:00
Philip P. Moltmann
251657696b Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
am: 7fa4198ab1

Change-Id: I27fd5421f329fb0bce97334e3388a956984b3d16
2017-04-18 22:37:12 +00:00
Philip P. Moltmann
7fa4198ab1 Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev 2017-04-18 22:28:20 +00:00
Todd Kennedy
1b92db197c Merge "update docs per API council" into oc-dev
am: 43b814b1d2

Change-Id: Ia91175538175bd9fdb98fb13151856e8d5f2e395
2017-04-18 22:26:22 +00:00
nharold
d1b8845dec Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf am: 8508bc52d2 am: 6eab2ee093
am: 862bd82fb8

Change-Id: I8e88fe65b649e92e900c343862207bfd6089003d
2017-04-18 22:24:54 +00:00
Nathan Harold
15f638b44a Consistenly Throw IOExceptions from IpSecManager am: 0bfb207532 am: 5db180bbb7 am: 7883c5d460
am: 86901592e7

Change-Id: If303276e7bd6a12a981492043a3d5e9a422d20b8
2017-04-18 22:23:52 +00:00
Felipe Leme
aa00896b8d Clone autofill service settings on managed profile.
Test: manual verification
Change-Id: I9d13e4230265b18444bfd30fd403c5fb98b88159
Fixes: 37351722
2017-04-18 15:14:43 -07:00
Daniel Sheng
6dad3e41ad Merge "Added Sesame camera lift gesture settings. Test: make" 2017-04-18 22:13:26 +00:00
nharold
862bd82fb8 Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf am: 8508bc52d2
am: 6eab2ee093

Change-Id: Iaa713ba4b20bab12331bd996288ed2440c349db2
2017-04-18 22:12:54 +00:00
Nathan Harold
86901592e7 Consistenly Throw IOExceptions from IpSecManager am: 0bfb207532 am: 5db180bbb7
am: 7883c5d460

Change-Id: I04198299d43da4c9c91f705acc5520f734ad9249
2017-04-18 22:11:18 +00:00
TreeHugger Robot
43b814b1d2 Merge "update docs per API council" into oc-dev 2017-04-18 22:09:32 +00:00
nharold
6eab2ee093 Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf
am: 8508bc52d2

Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
2017-04-18 22:02:48 +00:00
Nathan Harold
7883c5d460 Consistenly Throw IOExceptions from IpSecManager am: 0bfb207532
am: 5db180bbb7

Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
2017-04-18 22:01:32 +00:00
Chris Wren
572c5df578 guard against nulls in LogMaker
Bug: 36909905
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: Ibd12bf12f9b1ed5fbc926ec04bbfa429ff98f7d2
2017-04-18 17:43:00 -04:00
Suprabh Shukla
c2f5258e2c Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev am: 94ac6ae6d9
am: f415b0c034

Change-Id: I19a478e453da13a5ecd1e6d1ec097172a5c603fd
2017-04-18 21:30:02 +00:00
Suprabh Shukla
f415b0c034 Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev
am: 94ac6ae6d9

Change-Id: I7f52edc4dcbd1e7c9e876776412b6387c3e9ecbc
2017-04-18 21:21:14 +00:00
TreeHugger Robot
94ac6ae6d9 Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev 2017-04-18 21:07:48 +00:00
Doris Ling
842279aa64 Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev am: a86e3d70e3
am: 347da9a4f4

Change-Id: I3d9ac324c7ade67f69b750b126864dcbd7f8280a
2017-04-18 20:49:02 +00:00
Doris Ling
347da9a4f4 Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev
am: a86e3d70e3

Change-Id: I68121fbe007d659fb3a4b9930b8457d1289724a1
2017-04-18 20:42:57 +00:00
TreeHugger Robot
a86e3d70e3 Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev 2017-04-18 20:33:47 +00:00
Daniel Sheng
45e0d34f45 Added Sesame camera lift gesture settings.
Test: make

Change-Id: I84ea9a8db0e09e0c02abc18a8f63e0b04efe8b7f
2017-04-18 12:47:54 -07:00
Philip P. Moltmann
9023d14fb3 Change saveOnAllViewsInsible from boolean to flags
Change-Id: Ibd6f283479bad841eb7b20bb8d006562c4398e9f
Fixes: 35708237
Test: CtsAutoFillServiceTestCases
2017-04-18 10:24:48 -07:00
Makoto Onuki
fdba38b099 Merge "Log screen-on latency with tron" into oc-dev am: 2b499e4eba
am: 968e3fa045

Change-Id: Ia78e0c1f9064fb1d38b3ed4cba008074d68965b2
2017-04-18 16:13:46 +00:00
Makoto Onuki
968e3fa045 Merge "Log screen-on latency with tron" into oc-dev
am: 2b499e4eba

Change-Id: I403d3daa5c12dc1465ae8d1a37dc6cddc27f18f9
2017-04-18 16:03:29 +00:00
Makoto Onuki
2b499e4eba Merge "Log screen-on latency with tron" into oc-dev 2017-04-18 15:56:31 +00:00
Andrei Stingaceanu
7c82f31d58 Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev am: 2ed861d560
am: bf0a4e1de8

Change-Id: I99612b644c50029800f4b9171218c8bdde90ecf8
2017-04-18 14:41:03 +00:00
Andrei Stingaceanu
bf0a4e1de8 Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev
am: 2ed861d560

Change-Id: I0097c1a6ab90fe1e9085c36b2777a708ea616403
2017-04-18 14:30:10 +00:00
Bryce Lee
57f7a1486e Merge "Deprecate ActivityManager#getRunningServices" into oc-dev am: 25b7687771
am: 178fe0d0f3

Change-Id: Id6c0c4f36d29071497d43f36bdc8a87ade9a2e43
2017-04-18 14:29:57 +00:00
Andrei Stingaceanu
2ed861d560 Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev 2017-04-18 14:20:33 +00:00
Bryce Lee
178fe0d0f3 Merge "Deprecate ActivityManager#getRunningServices" into oc-dev
am: 25b7687771

Change-Id: Id37de21d7c3ed7436a1fc75a64c300a4bf622fc6
2017-04-18 14:20:32 +00:00