Commit Graph

76688 Commits

Author SHA1 Message Date
Tobias Thierer
5f3d5e91ee Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef am: d20ae24fb1
am: fbaf4253ae

Change-Id: I3116c759bc651e2fe4a93c17685d7f458d1d436e
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

Change-Id: I275c4fb658f6c158d38a6062bf1622e239e1603c
2017-11-08 16:52:46 +00:00
Tobias Thierer
d20ae24fb1 Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am: e8b07e5bef

Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
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

Change-Id: I0e09e64bb2a6306c0422443038351fabf10e2d6e
2017-11-08 06:57:00 +00:00
Hugo Benichi
76c2cd2a6a Merge "Define MacAddress class" am: 925349ac8f
am: 37caaaa705

Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
2017-11-08 06:46:49 +00:00
Hugo Benichi
37caaaa705 Merge "Define MacAddress class"
am: 925349ac8f

Change-Id: If270c17b1b763e302b848fba2fe4660ce5929018
2017-11-08 06:39:40 +00:00
Hugo Benichi
e5b0f9f723 Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c am: 5480314039
am: 2e2763f067

Change-Id: I5c3d7acf4765daaa31b593f8cb51566de6cf89c5
2017-11-08 03:56:40 +00:00
Hugo Benichi
2e2763f067 Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c
am: 5480314039

Change-Id: I26ec8ca2d10eb5071de701043f60b67bcfbf7ba5
2017-11-08 03:48:40 +00:00
Hugo Benichi
5480314039 Merge "Networking metrics: minor pretty printing improvements"
am: ee56b4a65c

Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
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
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

Change-Id: I009e5d8a7b32705f3ac01f989b4e68b5fa5664ef
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

Change-Id: Ied66e9bfef6708e0c03b0f97240e3a4b67780ddf
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

Change-Id: Ic915bece1025d8ad8a0ed05e9b20afa9bfcdd811
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

Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
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

Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
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

Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
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

Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
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

Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
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

Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
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

Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
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

Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
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

Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
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

Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
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

Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814 Adjust Uri host parsing to use last instead of first @.
am: cd6228dd37

Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
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
Selim Cinek
c7b5f78765 Merge changes from topic "notification_messaging"
* changes:
  Fixed measuring of messages with excess space
  Fixed the handling of oneToOne conversations for certain apps
  Improved the messaging transformation
  Implemented animations for messaging changes
  Refactored clipping util to be used in core
  Improved the headsup notification for messages
  Redesigned the messaging style
  Fixed a bug where images weren't transforming properly
2017-11-07 18:42:24 +00:00
Jeff Sharkey
7e19f53f75 Abort long-running benchmarks, report progress.
A typical storage device finishes the benchmark in under 10 seconds,
but some extremely slow devices can take minutes, resulting in a
confusing UX that looks like we've frozen.  Even worse, we keep
churning through all that I/O even though we know the device will
blow past our user-warning threshold.

So periodically check if we've timed out, and also use that to report
progress up into the Settings UI.

Test: manual
Bug: 62201209, 65639764, 67055204
Change-Id: Id28e63a7ea1476d83184abab5aea737a1d193f3a
2017-11-07 09:51:53 -07:00
John Reck
0f6fae9efa Merge "Remove unneeded JNI method" 2017-11-07 16:29:08 +00:00
Adam Vartanian
cd6228dd37 Adjust Uri host parsing to use last instead of first @.
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser.  The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.

* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
  is being used to build up the host name, each time an @ is found, so it
  has the effect of using the content between the final @ and the end
  of the authority section as the hostname.

Bug: 68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
2017-11-07 15:51:53 +00:00
Jeff Sharkey
3c027e49f4 Merge "Consistent handleApplicationStrictModeViolation." 2017-11-07 06:34:03 +00:00
Erik Kline
6c5c1d7346 Merge "Replace dns_tls with private_dns_mode setting" am: 8cf645c04d am: f1799116c2
am: 76d2732ad8

Change-Id: Icba28e4d4e446dd6eac0f2f017957894e33084f2
2017-11-07 06:23:05 +00:00
Erik Kline
76d2732ad8 Merge "Replace dns_tls with private_dns_mode setting" am: 8cf645c04d
am: f1799116c2

Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
2017-11-07 06:12:39 +00:00
Erik Kline
f1799116c2 Merge "Replace dns_tls with private_dns_mode setting"
am: 8cf645c04d

Change-Id: I421a750561ddde0afc6a70ba6369c83ab2e33571
2017-11-07 06:03:01 +00:00
Erik Kline
4d092238de Replace dns_tls with private_dns_mode setting
Also includes:
    - SettingsLib strings used in PrivateDnsModeDialogPreference
      interaction in the Settings app
    - rename ContentResolver "resolver" in methods working with
      DNS resolvers (too confusing)

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net
    - no new failures in SettingsBackupTest nor in SettingsProviderTest
    - manual interaction with developer option works
Bug: 34953048
Bug: 64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
2017-11-07 12:47:36 +09:00
Tobias Thierer
99a1d450da Track deprecation/replacement of Os methods that depend on Mutable*
Another CL in this CL topic is deprecating/removing three methods
in android.system.Os, and introducing replacements.

This CL tracks that change by updating frameworks/base accordingly.

Test: Treehugger
Bug: 67901714

Change-Id: I96ad205a305801b2cb641ba8984810dfe6474032
2017-11-07 02:51:27 +00:00
TreeHugger Robot
7fe465a9e7 Merge "SidekickService (base)" 2017-11-07 02:29:16 +00:00
Neil Fuller
0ab8a0d27b Add TimeZoneRulesDataContract to system API
Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).

Bug: 31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8
2017-11-07 01:12:28 +00:00
Selim Cinek
f7409dbbb2 Fixed the handling of oneToOne conversations for certain apps
Certain apps were using specific white-spaces in order to get
an effect they wanted on the old messaging style. We're now
fixing that to ensure that the transition is smoothed

Test: manual send messages using multiple apps
Bug: 63708826
Change-Id: Ie8628c5b394b974f3dfcbbc6f26a7f50bc60a7b9
2017-11-06 16:22:08 -08:00
Selim Cinek
e62255ccc5 Improved the headsup notification for messages
Previously the heads up notifications and also the collapsed versions were not
displaying in the new style.
They are now displayed in the new style of heads up notifications.

Test: add messaging notification in heads up
Bug: 63708826
Change-Id: I041584cd6ee740fd8c59f332f727ed83c89e777f
2017-11-06 16:22:07 -08:00