OSDN Git Service
Adam Lesinski [Fri, 10 Nov 2017 17:32:52 +0000 (17:32 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
Jon Dormody [Fri, 10 Nov 2017 17:28:30 +0000 (17:28 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3
am:
719e8b5412
Change-Id: I779bd97e6668809dfadf50d4361b6b88ee4ee710
Jon Dormody [Fri, 10 Nov 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
am:
ec741b83a3
Change-Id: I9d170c0baf186d074c77d2a98bd60bee66bfd701
Kevin Hufnagle [Fri, 10 Nov 2017 17:01:17 +0000 (17:01 +0000)]
Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev
Jon Dormody [Fri, 10 Nov 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
TreeHugger Robot [Fri, 10 Nov 2017 10:01:37 +0000 (10:01 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
Jonathan Dormody [Thu, 9 Nov 2017 23:53:14 +0000 (16:53 -0700)]
Docs: Fixed a typo by changing "retu rn" to "return"
Test: make ds-docs
Bug:
32830129
Change-Id: I86b359c2cf65fbd3c9d50569bf81fd669111055e
Adam Lesinski [Wed, 8 Nov 2017 01:08:07 +0000 (17:08 -0800)]
AAPT2: Workaround for feature splits without namespacing
Android Instant Apps in its current iteration does not use namespaces,
but due to limitations on the Android resource runtime, needs to make
it look like it does.
This is due to a bug that treats any package ID that's not 0x01 or 0x7F
as a shared library. Shared libraries require unique package names.
As a workaround, and since Android Instant Apps can not have a feature
depend on another feature, we can alter the resource package name of a
feature split just before writing it out to disk. This avoids using a
unique package name while linking, thereby avoiding namespace issues.
Bug:
68820737
Test: manual
Merged-In: Ic553ed42656436bbb949393d0248ee7bb9d37860
Change-Id: Ic553ed42656436bbb949393d0248ee7bb9d37860
Kevin Hufnagle [Thu, 9 Nov 2017 17:50:14 +0000 (09:50 -0800)]
docs: Added SQLite versions used on API levels 26 and 27.
The android.database.sqlite package summary page now mentions the
versions of SQLite that are available on Android devices running Oreo
(API level 26) and API level 27.
Test: make ds-docs -j16
Bug:
69106585
Change-Id: I77a323c58343fa978ade5397d613566ba25f00c2
Jon Dormody [Thu, 9 Nov 2017 16:26:50 +0000 (16:26 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am:
459735662f
am:
13e959bbec
Change-Id: Ic15e947e38c10d394081598e2c2886854388996a
Jon Dormody [Thu, 9 Nov 2017 16:17:35 +0000 (16:17 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
am:
459735662f
Change-Id: I31f036fa2365084454ac7899d92580e985bd9f21
Jon Dormody [Thu, 9 Nov 2017 16:05:13 +0000 (16:05 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
Adam Lesinski [Mon, 6 Nov 2017 18:44:46 +0000 (10:44 -0800)]
AAPT2: Differentiate between Android and Java package names
Android package names are more strict (ASCII only) than Java package names.
Also fixed an issue where trailing underscores were disallowed in Android
package names.
Bug:
68468089
Test: make aapt2_tests
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Jonathan Dormody [Wed, 8 Nov 2017 23:58:16 +0000 (16:58 -0700)]
Docs: Added a link to Updating Your Security Provider to Protect Against
SSL Exploits
Test: make ds-docs
Bug:
19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
Adam Vartanian [Wed, 8 Nov 2017 00:38:27 +0000 (00:38 +0000)]
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
Adam Vartanian [Wed, 8 Nov 2017 00:15:23 +0000 (00:15 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 23:50:35 +0000 (23:50 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 23:30:44 +0000 (23:30 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 23:04:25 +0000 (23:04 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 22:41:48 +0000 (22:41 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
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
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Adam Vartanian [Tue, 7 Nov 2017 12:22:23 +0000 (12:22 +0000)]
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
Bill Yi [Tue, 7 Nov 2017 06:40:03 +0000 (22:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4466ce0640d6c86b975fd0290ca53b592b5d27e9
Jorim Jaggi [Mon, 6 Nov 2017 19:01:06 +0000 (19:01 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev
Jorim Jaggi [Fri, 20 Oct 2017 12:33:18 +0000 (14:33 +0200)]
Fix issues with TRON app transition logging
There was a case where a app launch started activity A. A step in
the UI finished A and started B in the same task. Next time A was
started it immediately finished itself, putting B at the top of
the task. Now, this launch was considered aborted because A was
finished during launching, making it invisible.
We fix this by modifying the logic to only abort the launch if the
full task is not visible anymore after an activity has been set to
invisible.
There is another case where an app launches A, finishes A, and then
launches B. In this case the home gets visible in between so we
don't consider this an app launch anymore, and correctly cancel
the logging. However it's still useful to know that this is
happening to expose it to the developer, so we log any cancel
events, no matter where they are coming from.
Test: Launch Snapchat, click Sign Up, click home, relaunch
Snapchat from home
Test: Open slow app and press home quickly to test cancel.
Change-Id: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Merged-In: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Fixes:
67094673
Felipe Leme [Thu, 2 Nov 2017 20:42:17 +0000 (13:42 -0700)]
Added missing AutofillEventType so lint doesn't complain.
Test: In TreeHugger we trust!
Fixes:
68806712
Change-Id: I2f392161e71e0eca25a4a104b67e7d2982c90341
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
Christine Franks [Thu, 2 Nov 2017 01:13:21 +0000 (01:13 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev
Daniel Sandler [Thu, 2 Nov 2017 00:52:55 +0000 (00:52 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev
Bryce Lee [Thu, 2 Nov 2017 00:52:40 +0000 (00:52 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev
Julia Reynolds [Thu, 26 Oct 2017 15:30:31 +0000 (11:30 -0400)]
Allow dnd access for secondary users
Test: runtest systemui-notification
Change-Id: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f
Merged-In: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f
Fixes:
68060759
Bryce Lee [Tue, 31 Oct 2017 18:35:55 +0000 (11:35 -0700)]
DO NOT MERGE Remove orientation restriction to only fullscreen activities.
This changelist removes checks that enforce that only fullscreen,
opaque activities may request orientation changes. An application
may itself be compatible with the change and update their SDK level.
However, it is possible they use a library that has not itself been
updated and still leverages this feature for non-fullscreen
activities.
Fixes:
68684796
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: Ib5a60f0b660ad145d07e953e541a0a1b801aeef2
Michael Wachenschwanz [Tue, 31 Oct 2017 02:06:23 +0000 (19:06 -0700)]
AAPT2: Allow for nested inline xmls
Add recursion to InlineXmlFormatParser::Consume for handling nested
aapt:attr
Change-Id: Iabf98945b4f5ef22a3b8fdc4ca2bac092a377629
Fixes:
64385167
Test: make aapt2_tests
(cherry picked from commit
7b6b02bd13aea90b938c3ab3b1eaa3fb5043f931)
Leon Scroggins III [Tue, 31 Oct 2017 20:44:22 +0000 (20:44 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev am:
c4049e247f
am:
5fe26063fe
Change-Id: Id5c198a7f1a893f9d8f39dfd2927c471a624c3ef
Leon Scroggins III [Tue, 31 Oct 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
am:
c4049e247f
Change-Id: I7636d9eaf3983fc7ed0c1dc59ec2671ff762206e
TreeHugger Robot [Tue, 31 Oct 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
Siyamed Sinir [Tue, 31 Oct 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4
am:
43c494cb9c
Change-Id: I398b3011295e2783f23ca7993cbca273fef38e47
Siyamed Sinir [Tue, 31 Oct 2017 18:21:55 +0000 (18:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375
am:
6ad6e7f2f4
Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Siyamed Sinir [Tue, 31 Oct 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991
am:
cc2fcef375
Change-Id: I6c7a98c8e38a38dcd9ea2aa423ee93dbd0f12ed4
Siyamed Sinir [Tue, 31 Oct 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a
am:
9422f6e991
Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
Siyamed Sinir [Tue, 31 Oct 2017 17:41:58 +0000 (17:41 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e
am:
b353fbcb7a
Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
Siyamed Sinir [Tue, 31 Oct 2017 17:18:57 +0000 (17:18 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf
am:
eb863a6b2e
Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
Siyamed Sinir [Tue, 31 Oct 2017 17:05:15 +0000 (17:05 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856
am:
eeb90235bf
Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
Siyamed Sinir [Tue, 31 Oct 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b
am:
bc56010856
Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
Siyamed Sinir [Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am:
31bcb22572
am:
88f92e101d
Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815
Siyamed Sinir [Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03
am:
1f8536653b
Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
Siyamed Sinir [Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a
am:
c275b77b03
Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
Siyamed Sinir [Tue, 31 Oct 2017 16:31:04 +0000 (16:31 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
am:
31bcb22572
Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005
Siyamed Sinir [Tue, 31 Oct 2017 16:25:26 +0000 (16:25 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am:
a0c253d07a
Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
Siyamed Sinir [Tue, 31 Oct 2017 16:17:06 +0000 (16:17 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
Siyamed Sinir [Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
Andrew Solovay [Tue, 31 Oct 2017 16:15:57 +0000 (16:15 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
Christine Franks [Mon, 30 Oct 2017 23:22:37 +0000 (16:22 -0700)]
Respect legacy color mode settings
Bug:
68411440
Test: make -j100, verified starting with each of the three options.
Change-Id: I73e701a86733e0f8a5d017949052b16cdf58f398
(cherry picked from commit
17947177b38c0b583ce263b1f66454b84cb5959e)
Abodunrinwa Toki [Tue, 31 Oct 2017 03:23:35 +0000 (03:23 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am:
66ca42d5ac
am:
f247977cbe -s ours
Change-Id: I124dc4a15563effa89049e87efe2304867d05961
Abodunrinwa Toki [Tue, 31 Oct 2017 03:10:06 +0000 (03:10 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
am:
66ca42d5ac
Change-Id: I0e57e666f790c94ddf04d304a633c835a99d3d69
TreeHugger Robot [Tue, 31 Oct 2017 03:01:08 +0000 (03:01 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
Chong Zhang [Tue, 31 Oct 2017 00:41:00 +0000 (00:41 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288 am:
db258ebba8 am:
e3ac25eb0c
am:
bd7101937a
Change-Id: I78a26c3abfb72e9b873b719506f869df0aa87da1
Romain Guy [Thu, 31 Aug 2017 23:08:42 +0000 (16:08 -0700)]
docs: Fix documentation typo
CPd from master so we can update the website.
Test: make ds-docs
Bug:
65213121
Change-Id: I5bfc7074a42ec0ef5cd624b0bb72234e072684d3
(cherry picked from commit
d4012d6505c8b5368ee4607d54fb98d0a96ec136)
Chong Zhang [Tue, 31 Oct 2017 00:26:33 +0000 (00:26 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288 am:
db258ebba8
am:
e3ac25eb0c
Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a
Chong Zhang [Tue, 31 Oct 2017 00:11:32 +0000 (00:11 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa am:
5330335288
am:
db258ebba8
Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97
Chong Zhang [Mon, 30 Oct 2017 23:48:44 +0000 (23:48 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899 am:
396487f5aa
am:
5330335288
Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092
Chong Zhang [Mon, 30 Oct 2017 23:33:04 +0000 (23:33 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82 am:
f9e16c9899
am:
396487f5aa
Change-Id: Idf1ec8982316d3cef253609c702435a21d8f2eed
Chong Zhang [Mon, 30 Oct 2017 23:16:40 +0000 (23:16 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am:
914bc14e82
am:
f9e16c9899
Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde
Chong Zhang [Mon, 30 Oct 2017 23:00:59 +0000 (23:00 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
am:
914bc14e82
Change-Id: I9f8e2264e93590de4179ee5c6ab30c7509e775f5
Chong Zhang [Mon, 30 Oct 2017 22:46:40 +0000 (22:46 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
TreeHugger Robot [Mon, 30 Oct 2017 17:51:37 +0000 (17:51 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:49:07 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:48:16 +0000 (06:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:44:09 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:43:27 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 29 Oct 2017 16:50:30 +0000 (09:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6fd17c5a36e39a9a2009b6da91b7bc9aa1d7a251
Bill Yi [Sun, 29 Oct 2017 15:05:49 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If774e276d4d0e78233d6b22edbf33900ef866390
Bill Yi [Sun, 29 Oct 2017 14:33:12 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic418f5712f192bb12d935713042b22b124817725
Bill Yi [Sun, 29 Oct 2017 14:25:41 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I837b9a3c84d21544715855d80fc04af6fddf7b95
Bill Yi [Sun, 29 Oct 2017 14:17:58 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8f07e45a24fa38ff073987f7750f69a18499bf48
Bill Yi [Sun, 29 Oct 2017 04:52:30 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I2bf31993c0e7b7d6afec824c0163c85097a8c89c
TreeHugger Robot [Sat, 28 Oct 2017 02:45:48 +0000 (02:45 +0000)]
Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev
Andrew Solovay [Fri, 27 Oct 2017 20:02:34 +0000 (13:02 -0700)]
docs: Clarify wording on two Javadoc entries
Per feedback from dmail@, rephrased to clarify that the intent is
fired at the time when a USB device/accessory is attached, not a
general "a USB device happens to be attached now" notification.
Staged to:
http://go/dac-stage/reference/android/hardware/usb/UsbManager.html
Bug:
36672976
Test: make ds-docs
Change-Id: I9f1c202d0a6a6a5b25cf775e2b11119a26625bf1
Andrew Solovay [Sat, 28 Oct 2017 01:49:32 +0000 (01:49 +0000)]
Merge "docs: Typo fixes" into oc-mr1-dev
Felipe Leme [Thu, 26 Oct 2017 16:23:43 +0000 (09:23 -0700)]
Minor fixes on SaveInfo javadoc.
Test: ran 'mmm -j108 frameworks/base/:doc-comment-check-docs' and checked HTML
Bug:
68402851
Merged-in: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Change-Id: I9ba776be77132942d516d23ac69d3ad9f9b3da62
Andrew Solovay [Fri, 27 Oct 2017 22:11:48 +0000 (15:11 -0700)]
docs: Typo fixes
See first comment for doc stage location.
Change-Id: I29661ffab0ff10021671df0b725c9f9b12430960
Bug:
67886596
Bug:
67932414
Test: make ds-docs
Guang Zhu [Thu, 26 Oct 2017 00:04:25 +0000 (17:04 -0700)]
limit the verbosity of app crash failure message
- reporting full dropbox content for all detected crashes leads
to overly verbose test failure message
Bug:
67002148
Test: http://sponge/
4ff3ccb5-c455-45e2-9614-
d3527e1f711d
Change-Id: Ic2cd2ba4ce2af0954f186b196c18cc76c19f2007
Daniel Sandler [Fri, 27 Oct 2017 14:39:01 +0000 (14:39 +0000)]
Merge "Give fg services a shelf life before they go bad." into oc-mr1-dev
Dan Sandler [Fri, 27 Oct 2017 03:27:57 +0000 (23:27 -0400)]
Give fg services a shelf life before they go bad.
When a fg service starts (as indicated by its presence in a
NOTE_FOREGROUND_SERVICES notification), we note the service
start time (as encoded in Notification.when in ActivityMgr).
SysUI will suppress the dungeon (foreground service
disclosure) notification until 5 seconds have elapsed since
the earliest service start time. After that, if the service
is still running, the disclosure will be shown.
Bug:
67819284
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I5b6df95eb673e2f551aaa3ecc5a7df617f815a90
TreeHugger Robot [Fri, 27 Oct 2017 10:20:09 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 27 Oct 2017 06:27:26 +0000 (23:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I752d240f2a039f727edac641136078ddee540e34
Android Build Merger (Role) [Fri, 27 Oct 2017 03:25:38 +0000 (03:25 +0000)]
Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:
37082aa53e -s ours" into oc-mr1-dev
Christine Franks [Fri, 27 Oct 2017 03:23:01 +0000 (03:23 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
am:
37082aa53e -s ours
Change-Id: I6a7d3864db78ac95a175cc9097a821daa6ea6658
Chad Brubaker [Fri, 27 Oct 2017 03:22:39 +0000 (03:22 +0000)]
Merge "Allow internal services access to instant apps" into oc-mr1-dev
Jason Monk [Fri, 27 Oct 2017 03:15:58 +0000 (03:15 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
am:
885bf1302e -s ours
Change-Id: Ia35e09b9935da7bd63f08afd82dac950a9acd344
TreeHugger Robot [Fri, 27 Oct 2017 01:07:19 +0000 (01:07 +0000)]
Merge "ActivityManager: Change documentation of low RAM" into oc-mr1-dev
Romain Guy [Fri, 27 Oct 2017 00:07:58 +0000 (00:07 +0000)]
Add color mode setting
am:
af5e11245d -s ours
Change-Id: I57d6a2503f28fb8c26ac0e5e644306bbe812a347