TreeHugger Robot
4a3d844742
Merge "Very initial field detection prototype."
2017-11-08 19:13:39 +00:00
nharold
2b267dfbe9
Merge "Fix signature for finalize() to resolve API Lint error" am: c8ff280e73 am: c09d405e1d
...
am: f61308b9e4
2017-11-08 18:46:41 +00:00
Benedict Wong
cdd1d0ae7f
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5 am: 6491b03410
...
am: d840f4d667
2017-11-08 18:27:06 +00:00
nharold
f61308b9e4
Merge "Fix signature for finalize() to resolve API Lint error" am: c8ff280e73
...
am: c09d405e1d
2017-11-08 18:20:06 +00:00
Benedict Wong
d840f4d667
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
...
am: 6491b03410
2017-11-08 18:12:25 +00:00
Evan Rosky
eac26194e8
Merge "Make PopupWindows into root namespaces"
2017-11-08 18:11:33 +00:00
nharold
c09d405e1d
Merge "Fix signature for finalize() to resolve API Lint error"
...
am: c8ff280e73
2017-11-08 18:11:20 +00:00
TreeHugger Robot
5414610c7a
Merge "Fix the list of PROCESS_TEXT items in the toolbar."
2017-11-08 18:09:12 +00:00
Benedict Wong
6491b03410
Merge "Update documentation for AES-GCM-ESP keymat length"
...
am: 3db35dfcd5
2017-11-08 18:02:53 +00:00
nharold
c8ff280e73
Merge "Fix signature for finalize() to resolve API Lint error"
2017-11-08 17:56:43 +00:00
Benedict Wong
3db35dfcd5
Merge "Update documentation for AES-GCM-ESP keymat length"
2017-11-08 17:47:40 +00:00
Tobias Thierer
5f3d5e91ee
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef am: d20ae24fb1
...
am: fbaf4253ae
2017-11-08 17:09:37 +00:00
Tobias Thierer
fbaf4253ae
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef
...
am: d20ae24fb1
2017-11-08 16:52:46 +00:00
Tobias Thierer
d20ae24fb1
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
...
am: e8b07e5bef
2017-11-08 16:44:30 +00:00
Tobias Thierer
e8b07e5bef
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
2017-11-08 16:34:03 +00:00
Richard Ledley
7c0abe1920
Merge "Initial implementation of generateLinks"
2017-11-08 13:35:21 +00:00
TreeHugger Robot
e67f22bbf3
Merge "Fixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)"
2017-11-08 12:26:51 +00:00
Richard Ledley
68d9452346
Initial implementation of generateLinks
...
Test: Included, and ag/3141575
Change-Id: Ia91aa130e95ff347c55981b68b8d975bc8131a73
2017-11-08 10:54:09 +00:00
yuemingw
2280019d5a
Fix cts failure for com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
...
Change-Id: Iba6078f06d7d251a12c530058d1f2ace78aa3e92
Fix: 68954948
Test: com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
2017-11-08 10:27:14 +00:00
TreeHugger Robot
5cc7ea1ff8
Merge "Added new update engine error codes from /android/system/update_engine/common/error_code.h"
2017-11-08 09:03:07 +00:00
Hugo Benichi
ffdbb572e5
Merge "Define MacAddress class" am: 925349ac8f am: 37caaaa705
...
am: 76c2cd2a6a
2017-11-08 06:57:00 +00:00
Hugo Benichi
76c2cd2a6a
Merge "Define MacAddress class" am: 925349ac8f
...
am: 37caaaa705
2017-11-08 06:46:49 +00:00
Hugo Benichi
37caaaa705
Merge "Define MacAddress class"
...
am: 925349ac8f
2017-11-08 06:39:40 +00:00
Hugo Benichi
e5b0f9f723
Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c am: 5480314039
...
am: 2e2763f067
2017-11-08 03:56:40 +00:00
Hugo Benichi
2e2763f067
Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c
...
am: 5480314039
2017-11-08 03:48:40 +00:00
Hugo Benichi
5480314039
Merge "Networking metrics: minor pretty printing improvements"
...
am: ee56b4a65c
2017-11-08 03:39:55 +00:00
Hugo Benichi
59c8e423a8
Define MacAddress class
...
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
2017-11-08 11:09:49 +09:00
Nathan Harold
440824f743
Fix signature for finalize() to resolve API Lint error
...
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug: 69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
2017-11-07 17:46:12 -08:00
Benedict Wong
4ebc2c5968
Update documentation for AES-GCM-ESP keymat length
...
Added notes that keymat length must include 32 bits of salt.
Bug: 68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
2017-11-07 17:39:35 -08:00
Adam Vartanian
e0c97dfef8
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a am: 560fb5d050 am: 2edd31e7fc am: 97ff9f9d27
...
am: 580feb2e37
2017-11-08 01:39:17 +00:00
Adam Vartanian
580feb2e37
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a am: 560fb5d050 am: 2edd31e7fc
...
am: 97ff9f9d27
2017-11-08 01:13:26 +00:00
Hugo Benichi
c867f787bc
Networking metrics: minor pretty printing improvements
...
Bug: 65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
2017-11-08 09:47:58 +09:00
Adam Vartanian
97ff9f9d27
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a am: 560fb5d050
...
am: 2edd31e7fc
2017-11-08 00:38:27 +00:00
Adam Vartanian
2edd31e7fc
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a
...
am: 560fb5d050
2017-11-08 00:15:23 +00:00
Adam Vartanian
560fb5d050
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba
...
am: a2149abe3a
2017-11-07 23:50:35 +00:00
Adam Vartanian
a2149abe3a
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc
...
am: eb4598afba
2017-11-07 23:30:44 +00:00
Adam Vartanian
eb4598afba
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333
...
am: 49dfdd66cc
2017-11-07 23:04:25 +00:00
Adam Vartanian
49dfdd66cc
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21
...
am: f61daaa333
2017-11-07 22:41:48 +00:00
Adam Vartanian
f61daaa333
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c
...
am: 3ac5dabc21
2017-11-07 22:12:09 +00:00
Adam Vartanian
3ac5dabc21
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362
...
am: 240b55de2c
2017-11-07 21:56:10 +00:00
Adam Vartanian
240b55de2c
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e
...
am: 49e5fca362
2017-11-07 21:41:55 +00:00
Adam Vartanian
49e5fca362
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3
...
am: eee677386e
2017-11-07 21:29:27 +00:00
Nikolas Bravo
6283100a87
Fixes javadoc documentation of PackageInstaller.SessionParams#setOriginatingUid(int)
...
* Current "See also" link in https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams.html#setOriginatingUid(int) is not only wrong, but also broken
* Added a missing "the"
Test: none
Change-Id: I90410ed3393b5c37afdf0476eb70821fae9f63fd
2017-11-07 21:11:40 +00:00
TreeHugger Robot
b6ba247188
Merge "Expose EXTRA_SUB_ID."
2017-11-07 21:09:46 +00:00
Adam Vartanian
eee677386e
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814
...
am: 4158c9fbf3
2017-11-07 21:02:07 +00:00
Adam Vartanian
4158c9fbf3
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37
...
am: 6a9c7c4814
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814
Adjust Uri host parsing to use last instead of first @.
...
am: cd6228dd37
2017-11-07 20:41:28 +00:00
scypher
f5a53658b2
Added new update engine error codes from
...
/android/system/update_engine/common/error_code.h
Test: Exposed new constant and manually added the change to
api/system-current.txt due to b/68874686
Bug: 68380039
Change-Id: I01a8befe07d37dfa74d3544b80bde2c2cc48acdb
2017-11-07 11:25:04 -08:00
Jeff Sharkey
508cce3f4a
Merge "Abort long-running benchmarks, report progress."
2017-11-07 19:23:25 +00:00
Abodunrinwa Toki
c28be38ee2
Fix the list of PROCESS_TEXT items in the toolbar.
...
Bug introduced in I56c71450c850e1d8cd80d54d4e17a6390823485f
Bug: 66939160
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Change-Id: I8e9aee8791e2c6ba341015fa3a1c997004e7066a
2017-11-07 18:46:50 +00:00
