OSDN Git Service
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours
am:
daa1d87e50 -s ours
Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours
am:
1fccf167ff -s ours
Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
406659b709 -s ours
Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Felipe Leme [Fri, 8 Dec 2017 18:39:01 +0000 (18:39 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
am:
bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
TreeHugger Robot [Fri, 8 Dec 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]
Make sure apps cannot forge package name on AssistStructure used for Autofill.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
69981710
Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Rubin Xu [Mon, 4 Dec 2017 11:32:48 +0000 (11:32 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb
TreeHugger Robot [Sat, 2 Dec 2017 00:01:31 +0000 (00:01 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-dev
Kevin Hufnagle [Fri, 1 Dec 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
am:
a96e533840
Change-Id: Iefd97a3d8b1377dd72f3a3428c539cb029b4e0a9
Kevin Hufnagle [Fri, 1 Dec 2017 20:06:38 +0000 (20:06 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
Jon Dormody [Fri, 1 Dec 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
am:
ce7f1e6601
Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca
Jon Dormody [Fri, 1 Dec 2017 16:07:27 +0000 (16:07 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
am:
fb839ce59a
Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf
Jon Dormody [Fri, 1 Dec 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
Jon Dormody [Fri, 1 Dec 2017 15:52:54 +0000 (15:52 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
Jonathan Dormody [Thu, 30 Nov 2017 22:06:55 +0000 (15:06 -0700)]
Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor
Test: make ds-docs
Bug:
1766768
Change-Id: Idfea122569bb6f80889be3f224f9629cfebc0ca3
Jonathan Dormody [Thu, 16 Nov 2017 18:25:20 +0000 (11:25 -0700)]
Docs: Added mention that the getSharedPreferences method is thread
safe.
Test: make ds-docs
Bug:
5370116
Change-Id: I5aa851db5e1dbcb3563f1ce15f96cc10c80e90ba
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
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
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
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
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: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
Rubin Xu [Tue, 31 Oct 2017 15:40:32 +0000 (15:40 +0000)]
Swap the order of synthetic password wrapping
Synthetic password is double encrypted by both a random auth-bound keymaster
key and a secret derived from user password. In order to avoid a password
verification oracle without rate limiting, synthetic password needs to be
encrypted by the derived secret first, and then the auth-bound key. This
change corrects the order of encryptions, as well as adds an upgrade path to
refresh existing credentials.
Test: Running an old build with existing password, flash to new build,
verify the device unlocks successfully.
Bug:
68694819
Change-Id: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Merged-In: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
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: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: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
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: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 [Thu, 26 Oct 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Support native and srgb for night display" into oc-dr1-dev
TreeHugger Robot [Thu, 26 Oct 2017 22:17:40 +0000 (22:17 +0000)]
Merge changes from topic "b-
68279369" into oc-dr1-dev
* changes:
Auto-dim refinements
Refinement of auto-dimming nav
Don't touch auto dim on app change
Auto dim the nav bar to help prevent diff aging
Christine Franks [Wed, 25 Oct 2017 02:04:22 +0000 (19:04 -0700)]
Support native and srgb for night display
Bug:
68159303
Test: make -j100
Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change
Test: manual
Bug:
63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306
Jason Monk [Tue, 29 Aug 2017 22:58:00 +0000 (18:58 -0400)]
Auto dim the nav bar to help prevent diff aging
Test: runtest systemui
Bug:
63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4
Romain Guy [Tue, 24 Oct 2017 20:37:34 +0000 (21:37 +0100)]
Add color mode setting
The new setting appears on devices that support color management
and wide color gamut rendering. The setting allows the user to
choose between natural (sRGB), boosted (sRGB + 10% saturation)
and saturated (unmanaged colors; colors are remapped to the device's
native gamut).
This change adds a metric constant for analytics in Settings
and uses a persistent system property to know when to suppress
color management.
Bug:
68159303
Test: manual
Merged-In: I83cc972fc3a2290ff106eae0e76a3ee799503813
Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813
(cherry picked from commit
62e8c175257d25c64ed19e5ccccd4e3cd987b8ad)
Abodunrinwa Toki [Sun, 22 Oct 2017 20:55:07 +0000 (21:55 +0100)]
DO NOT MERGE Disable smart sharing for password fields.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug:
66244132
Merged-In: Ifbf2c39d9f304251adc8c4acdf1b4fd6914011d8
Change-Id: If7d6f0240db22720fb8316cdac85eceee8003b35
Dave Friedman [Wed, 25 Oct 2017 06:48:22 +0000 (06:48 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
am:
44cd5b97ad
Change-Id: I228d7395c9de8e164a0110c0d4fdf4530c7690ec
TreeHugger Robot [Wed, 25 Oct 2017 06:22:54 +0000 (06:22 +0000)]
Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug:
67967771 Test: Ran make ds-docs." into oc-dev
Chong Zhang [Tue, 24 Oct 2017 23:07:18 +0000 (16:07 -0700)]
mtp: fix double free of thumbnail data
bug:
67864232
Change-Id: I6eb51be839df12317273830521c70a4ed80f9496
Dave Friedman [Wed, 4 Oct 2017 23:26:10 +0000 (16:26 -0700)]
Docs: Adds brief instructions for how to do Wi-Fi scan.
Bug:
67967771
Test: Ran make ds-docs.
We don't actually document how to do a Wi-Fi scan anywhere on DAC;
at the moment, this seems like the place where it makes the most sense
to provide that guidance.
The forcing function for doing this is that a new doc explicitly
recommends that devs do Wi-Fi scans in certain cases, but doesn't
have a place to link to that tells them how to do so. That doc
plans to send readers here.
Change-Id: Ic35fb77d323e825e5bd5b4eec2716730f0d531e1
Jeff Sharkey [Fri, 20 Oct 2017 01:26:22 +0000 (01:26 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours
am:
571c8a4507
Change-Id: Ie4e871d2017d505461027c376946e2034105062a
Jeff Sharkey [Fri, 20 Oct 2017 01:11:01 +0000 (01:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours
am:
61d6dd8185
Change-Id: I9b862fb8aa4858bf57aa390c7d54a65bb19d12fd
Siyamed Sinir [Fri, 20 Oct 2017 00:58:26 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7
am:
6ecad744a9
Change-Id: I11a06f501b8278c356e7c2072c00b7d86470a64a
Jeff Sharkey [Fri, 20 Oct 2017 00:57:09 +0000 (00:57 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106
am:
af70ac2914 -s ours
Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a
Jeff Sharkey [Fri, 20 Oct 2017 00:46:57 +0000 (00:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb
am:
76d9732106
Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e
Jeff Sharkey [Fri, 20 Oct 2017 00:40:14 +0000 (00:40 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0
am:
00183554a9 -s ours
Change-Id: I6ff359477121027efd13e82ce530a4fce32d3564
Jeff Sharkey [Fri, 20 Oct 2017 00:31:27 +0000 (00:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b
am:
1b40397eb0
Change-Id: If7bafe99a0d9563f9c09f5632b6e023ee328ffdb
Siyamed Sinir [Fri, 20 Oct 2017 00:27:10 +0000 (00:27 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2
am:
21bdeacae7
Change-Id: I3c633755286caa3ae6538581bc05a8374a8ef691
Jeff Sharkey [Fri, 20 Oct 2017 00:22:39 +0000 (00:22 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2
am:
34e4628cfb
Change-Id: I0b37777cbd94bb4c3bc60315aff3a2ebc324273c
Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours
am:
b6ecd1f88a
Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415
Siyamed Sinir [Fri, 20 Oct 2017 00:12:31 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd
am:
c257b61ec2
Change-Id: I5369e96fe95e0db7206c61bb1af5b140a788890a
Jeff Sharkey [Fri, 20 Oct 2017 00:06:43 +0000 (00:06 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8
am:
832890f6e2
Change-Id: Ie3d4564dc4d4790f6cae5cbef45c47aa2eb5000a
Jeff Sharkey [Fri, 20 Oct 2017 00:03:14 +0000 (00:03 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2
am:
b049f43f9b
Change-Id: Id6f534c7fb34dcd7a16478de7a0de80688322d47
Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1
am:
260ef208ac -s ours
Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876
Jeff Sharkey [Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours
am:
73a4e88df8
Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614
Siyamed Sinir [Thu, 19 Oct 2017 23:47:49 +0000 (23:47 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e
am:
9f073ee9fd
Change-Id: I6d9c5637245a5e242761d8368aea06a4cbfbd013
Jeff Sharkey [Thu, 19 Oct 2017 23:46:05 +0000 (23:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81
am:
3c30346de2
Change-Id: Ib4bfd2cde222e01e876d9b4ffc3a2135037c860d
Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c
am:
14164f1bdf
Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16
am:
4dd01948c1
Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b
Jeff Sharkey [Thu, 19 Oct 2017 23:31:46 +0000 (23:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours
am:
7f00f14d81
Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf
Siyamed Sinir [Thu, 19 Oct 2017 23:29:06 +0000 (23:29 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9
am:
bf5b9d7e8e
Change-Id: Iffbe5920dbe7406a8e895901dd8cc097f22c397e
Jeff Sharkey [Thu, 19 Oct 2017 23:26:57 +0000 (23:26 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693
am:
3bb6994a0b -s ours
Change-Id: I5b8a2b5df614aa4abe813e48ebf030d15dbf0202
Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9
am:
02d89a3c0c
Change-Id: If82c97668497ce72ad29b055b15646291df66157
Jeff Sharkey [Thu, 19 Oct 2017 23:17:45 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b
am:
1455bd6492 -s ours
Change-Id: I2e15595d4e8f797d5b5606a5298ac50b83cf581b
OSDN Git Service
