OSDN Git Service
Jerry Zhang [Tue, 15 May 2018 22:42:03 +0000 (15:42 -0700)]
Merge "Call access(2) on all files/dirs modified by Mtp" into pi-dev am:
01f41f96fe
am:
73e4d170c5
Change-Id: I12a754ef36e72a3913d641012da3b0419e64c161
Jerry Zhang [Tue, 15 May 2018 22:37:21 +0000 (15:37 -0700)]
Merge "Access removable volumes through /mnt/media_rw" into pi-dev am:
1e62b676d9
am:
9e1d134556
Change-Id: I68bf226aaf424c9f0e7e54fe7817050ab6d4208c
Xiangyu/Malcolm Chen [Tue, 15 May 2018 22:19:06 +0000 (15:19 -0700)]
[automerger skipped] Merge "Unhide constructors of DataService and NetworkService." am:
272769c41a am:
5d17ca309d -s ours
am:
989517d50c -s ours
Change-Id: I27f4a83acdcd57fa1bb48fd7f91cce75d5cf6c8d
Kodlee Yin [Tue, 15 May 2018 22:14:54 +0000 (15:14 -0700)]
Merge "Update RemoteInput#setChoices documentation" into pi-dev am:
bef37f23d6
am:
f4a2505e3e
Change-Id: I8490319bf518be784fa73902bc4535f22e96727a
Damien Bargiacchi [Tue, 15 May 2018 21:58:20 +0000 (14:58 -0700)]
Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev am:
76fd7d5776
am:
3a3982a09c
Change-Id: I578a7e18ed407bb5d08e3960e68316fcd90025de
Jerry Zhang [Tue, 15 May 2018 21:55:19 +0000 (14:55 -0700)]
Merge "Call access(2) on all files/dirs modified by Mtp" into pi-dev
am:
01f41f96fe
Change-Id: I7c329a8cdff834a24a3e0ef3f82387421084b5de
Jiabin Huang [Tue, 15 May 2018 21:51:25 +0000 (14:51 -0700)]
Merge "Add support for manually set surround formats." into pi-dev am:
eddc0d712c
am:
bccbeb1bbb
Change-Id: I5bdce8b1103c970fd515028e48336fc26b9f2fbd
Jerry Zhang [Tue, 15 May 2018 21:50:02 +0000 (14:50 -0700)]
Merge "Access removable volumes through /mnt/media_rw" into pi-dev
am:
1e62b676d9
Change-Id: Ibc2cf0e4243adb0f69f2ba7ac3ca7526bb492b38
Xiangyu/Malcolm Chen [Tue, 15 May 2018 21:37:33 +0000 (14:37 -0700)]
[automerger skipped] Merge "Unhide constructors of DataService and NetworkService." am:
272769c41a
am:
5d17ca309d -s ours
Change-Id: Ib31cbe65f6ae600b6064909c4a0a43c22bd6ac40
Jerry Zhang [Tue, 15 May 2018 21:35:43 +0000 (21:35 +0000)]
Merge "Call access(2) on all files/dirs modified by Mtp" into pi-dev
Jerry Zhang [Tue, 15 May 2018 21:35:43 +0000 (21:35 +0000)]
Merge "Access removable volumes through /mnt/media_rw" into pi-dev
Robert Carr [Tue, 15 May 2018 21:34:03 +0000 (14:34 -0700)]
Merge "Report touchable region changes to Accessibility." into pi-dev am:
a2fccce557
am:
d55333566e
Change-Id: Ibf5c9c271a829c46b795131907d37eef688fe3ca
Kodlee Yin [Tue, 15 May 2018 21:28:26 +0000 (14:28 -0700)]
Merge "Update RemoteInput#setChoices documentation" into pi-dev
am:
bef37f23d6
Change-Id: Ibecefb1b3dcf0350190cb2d0de5bed149786d294
Xiangyu/Malcolm Chen [Tue, 15 May 2018 21:28:05 +0000 (14:28 -0700)]
Merge "Unhide constructors of DataService and NetworkService."
am:
272769c41a
Change-Id: I9c892244ef457a00e59700eb634cdef08b749046
Jordan Liu [Tue, 15 May 2018 21:20:28 +0000 (14:20 -0700)]
[automerger skipped] Merge "Update documentation of ApnSetting with V5 example" am:
1c0ef18c39 am:
3ae696bff2 -s ours
am:
3d06720c7d -s ours
Change-Id: I3a781ba7451a33588e12a5c3599aa8de546759f6
Damien Bargiacchi [Tue, 15 May 2018 21:19:25 +0000 (14:19 -0700)]
Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev
am:
76fd7d5776
Change-Id: Ia3360c6431fd9e8273150e7fba52e3922bc2095d
Phil Weaver [Tue, 15 May 2018 21:15:24 +0000 (14:15 -0700)]
Merge "Update a11y when alpha changes" into pi-dev am:
b504a2f65b
am:
291adf498d
Change-Id: I226fbf893ff7c92408bb64b7aa4d2a2d529c3232
Selim Cinek [Tue, 15 May 2018 21:12:08 +0000 (14:12 -0700)]
Merge "Made sure that the ambient single line view remains invisible" into pi-dev am:
75402c371b
am:
f15f5047fa
Change-Id: Ida6a68b2bd2775e174f591229dab940a6349fd44
Jiabin Huang [Tue, 15 May 2018 21:10:39 +0000 (14:10 -0700)]
Merge "Add support for manually set surround formats." into pi-dev
am:
eddc0d712c
Change-Id: I96c58363303db1ac7fc6dfa43c3bd57c7f8ab734
Felipe Leme [Tue, 15 May 2018 21:09:05 +0000 (14:09 -0700)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev am:
0b20fa45b8
am:
554fb5d4c6
Change-Id: Ic903d39ce61f83cca8f14dcad4d65077acbbd418
TreeHugger Robot [Tue, 15 May 2018 21:07:35 +0000 (21:07 +0000)]
Merge "Update RemoteInput#setChoices documentation" into pi-dev
Robert Carr [Tue, 15 May 2018 21:05:40 +0000 (14:05 -0700)]
Merge "Report touchable region changes to Accessibility." into pi-dev
am:
a2fccce557
Change-Id: I5ca2d764c0e000cf13a259cac5c59ca53282bce0
Rohan Shah [Tue, 15 May 2018 21:03:50 +0000 (14:03 -0700)]
Merge "[Notif] Safeguard animation start" into pi-dev am:
97d17a7774
am:
d4853c3206
Change-Id: Ie21a33df63c9cbcaa28545b98ff14ac1fe8075ab
Damien Bargiacchi [Tue, 15 May 2018 20:58:31 +0000 (20:58 +0000)]
Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev
Jiabin Huang [Tue, 15 May 2018 20:54:27 +0000 (20:54 +0000)]
Merge "Add support for manually set surround formats." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 20:51:16 +0000 (20:51 +0000)]
Merge "Report touchable region changes to Accessibility." into pi-dev
Jordan Liu [Tue, 15 May 2018 20:34:02 +0000 (13:34 -0700)]
[automerger skipped] Merge "Update documentation of ApnSetting with V5 example" am:
1c0ef18c39
am:
3ae696bff2 -s ours
Change-Id: Ia7c35d8daeb6c72f43e32215a5af0c0ccfda3e15
Svet Ganov [Tue, 15 May 2018 20:30:05 +0000 (13:30 -0700)]
Merge "Prevent instant apps to host app widgets" into pi-dev am:
dee2a78db6
am:
759237ccf8
Change-Id: Icf7892705dfe1925638129ed929bbbae0460511d
Jordan Liu [Tue, 15 May 2018 20:22:56 +0000 (13:22 -0700)]
Merge "Update documentation of ApnSetting with V5 example"
am:
1c0ef18c39
Change-Id: I36cdf4d62fe7a482fef1e7d30e011d12c19695c3
Phil Weaver [Tue, 15 May 2018 20:22:25 +0000 (13:22 -0700)]
Merge "Update a11y when alpha changes" into pi-dev
am:
b504a2f65b
Change-Id: I47118412434c9d433473f1dd3123d9c765c6a045
Selim Cinek [Tue, 15 May 2018 20:09:13 +0000 (13:09 -0700)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev am:
fbdd1f7d09
am:
78e030e1f6
Change-Id: If22dc6f1957d2e8c8ca334b25e6523c32b5053ed
Selim Cinek [Tue, 15 May 2018 20:01:43 +0000 (13:01 -0700)]
Merge "Made sure that the ambient single line view remains invisible" into pi-dev
am:
75402c371b
Change-Id: I171b5e8251fc1cd5133e39cfc4ddc2f8eaa49ff2
Felipe Leme [Tue, 15 May 2018 19:54:56 +0000 (12:54 -0700)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
am:
0b20fa45b8
Change-Id: Ic76d6edfb1a943d26ef7310221e260853e347e4e
Jason Monk [Tue, 15 May 2018 19:54:08 +0000 (12:54 -0700)]
Merge "Blacklist doze setting from tuner reset" into pi-dev am:
49cb81658d
am:
94dae6421d
Change-Id: I5913ca4b1f35e834723bbc771a8fdebe12b7a7a8
Phil Weaver [Tue, 15 May 2018 19:49:09 +0000 (19:49 +0000)]
Merge "Update a11y when alpha changes" into pi-dev
Kodlee Yin [Wed, 9 May 2018 23:19:56 +0000 (16:19 -0700)]
Update RemoteInput#setChoices documentation
The behavior that #setChoices didn't render on mobile devices from apps
that target SDK < P went undocumented. Because this is changing in P and
above, this documentation needs to point out this behavior.
Also updated formatting and style of docs to improve interop with
kotlin.
Test: none
Bug:
79244189
Change-Id: Iabfe3b2ddcc369e5ec15f9773481468cbc48dabb
Beverly [Tue, 15 May 2018 19:46:12 +0000 (12:46 -0700)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev am:
fd165bb5dd
am:
d311991bb0
Change-Id: I52f11e391f2aaea56d2e7390c97a8181decb1925
Rohan Shah [Tue, 15 May 2018 19:46:04 +0000 (12:46 -0700)]
Merge "[Notif] Safeguard animation start" into pi-dev
am:
97d17a7774
Change-Id: I607bc98d37c1689fdb26d660777e21715d017b07
TreeHugger Robot [Tue, 15 May 2018 19:42:39 +0000 (19:42 +0000)]
Merge "Made sure that the ambient single line view remains invisible" into pi-dev
Svet Ganov [Tue, 15 May 2018 19:33:20 +0000 (12:33 -0700)]
Merge "Prevent instant apps to host app widgets" into pi-dev
am:
dee2a78db6
Change-Id: Icd3b350305e21d607dd95476f3871e3638a0d5ff
Jerry Zhang [Mon, 14 May 2018 19:19:08 +0000 (12:19 -0700)]
Call access(2) on all files/dirs modified by Mtp
External sdcards are accessed through /mnt/media_rw,
so access() each touched file for sdcardfs to update
its metadata.
Java handles single object renames directly so that
is the only place where it is needed.
Bug:
77849654
Test: use mtp with emulated sdcard
Change-Id: Ie460398010f1fe74d8084808a6333b121674362c
Selim Cinek [Tue, 15 May 2018 19:28:06 +0000 (12:28 -0700)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
am:
fbdd1f7d09
Change-Id: I007934cfb8bd971e77291a56958fb55e1bfc5c3e
Yi Jin [Tue, 15 May 2018 19:23:53 +0000 (12:23 -0700)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev am:
0a3815958a
am:
6ef148ce5c
Change-Id: Ie5ca5fe0df06c14b8c72108ef53313b41b4acac4
TreeHugger Robot [Tue, 15 May 2018 19:20:19 +0000 (19:20 +0000)]
Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:12:38 +0000 (19:12 +0000)]
Merge "[Notif] Safeguard animation start" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 19:05:08 +0000 (19:05 +0000)]
Merge "Prevent instant apps to host app widgets" into pi-dev
Selim Cinek [Tue, 15 May 2018 19:04:01 +0000 (19:04 +0000)]
Merge "Fixed an issue where the wrong notification would be heads upped" into pi-dev
Nan Zhang [Tue, 15 May 2018 19:02:21 +0000 (12:02 -0700)]
Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp
am:
a2232e2803
Change-Id: Ibc453f8017ca35c69c1274b16e26a561caba8655
Xiangyu/Malcolm Chen [Tue, 15 May 2018 18:54:50 +0000 (18:54 +0000)]
Merge "Unhide constructors of DataService and NetworkService."
Amith Yamasani [Tue, 15 May 2018 18:53:02 +0000 (11:53 -0700)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev am:
c1eddaed6e
am:
92e2dadc0d
Change-Id: I61d7a43cc80a41ef2681f4c51ceedef538933a4b
Jason Monk [Tue, 15 May 2018 18:49:28 +0000 (11:49 -0700)]
Merge "Blacklist doze setting from tuner reset" into pi-dev
am:
49cb81658d
Change-Id: I52290b149ecee7c6dc81f98b7ef0cafad2846010
Beverly [Tue, 15 May 2018 18:40:32 +0000 (11:40 -0700)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
am:
fd165bb5dd
Change-Id: I14c1de8465663f379c6c031874cf12c0bb4f5317
TreeHugger Robot [Tue, 15 May 2018 18:38:36 +0000 (18:38 +0000)]
Merge "Blacklist doze setting from tuner reset" into pi-dev
Yi Jin [Tue, 15 May 2018 18:27:13 +0000 (11:27 -0700)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
am:
0a3815958a
Change-Id: Iadf8a52e65ba7930f419eacbaac9816992715506
Selim Cinek [Tue, 15 May 2018 18:17:07 +0000 (11:17 -0700)]
Made sure that the ambient single line view remains invisible
The single line views are visible by default when they are inflated
and not all calls to it actually ensure that the visibility is
updated. We therefore make sure that the view is appropriately
hidden.
Change-Id: Ied7641347d910fff5c8f1f0b38d349e7f3b56b76
Fixes:
77290485
Test: add second notification to group, observe no overlapping text
Selim Cinek [Tue, 15 May 2018 18:18:28 +0000 (11:18 -0700)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev am:
a1f417caf0
am:
b24bf549a0
Change-Id: If6c76f83ecf69c95bcdfd62f2f10334bff1d77af
Felipe Leme [Tue, 15 May 2018 17:38:13 +0000 (10:38 -0700)]
Fixed autofill compat mode so it works on secondary user.
Test: manual verification using Chrome and sample service
Test: atest CtsAutoFillServiceTestCases
Fixes:
79747293
Change-Id: I83b6fa23e9e7307e9eb44720942f55dc58820ed7
Jordan Liu [Tue, 15 May 2018 18:16:33 +0000 (18:16 +0000)]
Merge "Update documentation of ApnSetting with V5 example"
TreeHugger Robot [Tue, 15 May 2018 18:15:08 +0000 (18:15 +0000)]
Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp
Selim Cinek [Tue, 15 May 2018 18:01:12 +0000 (11:01 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev am:
bb24c6b501
am:
438a66d7ce
Change-Id: Iaef4a6566cbccf0e9b29cf57093ad2682ea598a4
Amith Yamasani [Tue, 15 May 2018 18:00:25 +0000 (11:00 -0700)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
am:
c1eddaed6e
Change-Id: I3a8bdfe2858c88854ab15aba6a619aac1fd66945
TreeHugger Robot [Tue, 15 May 2018 18:00:11 +0000 (18:00 +0000)]
Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:53:56 +0000 (10:53 -0700)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev
am:
a1f417caf0
Change-Id: I07bb66bde7633bcd52c7f875a85340fbf6b847ff
TreeHugger Robot [Tue, 15 May 2018 17:47:16 +0000 (17:47 +0000)]
Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
TreeHugger Robot [Tue, 15 May 2018 17:40:32 +0000 (17:40 +0000)]
Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:38:31 +0000 (17:38 +0000)]
Merge "Hiding all views when the notification shade is collapsed" into pi-dev
Selim Cinek [Tue, 15 May 2018 17:29:54 +0000 (10:29 -0700)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
am:
bb24c6b501
Change-Id: I4a13c7e18dbfc1a136d2a7b766d4b1259f18ff0e
Selim Cinek [Tue, 15 May 2018 17:28:16 +0000 (10:28 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev am:
2cfd9fb99c
am:
cb4e490d99
Change-Id: I0c2780d928c6bbe52a664655f5cc1f3750f19b2c
Selim Cinek [Tue, 15 May 2018 17:20:46 +0000 (10:20 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev am:
f81ad4b94c
am:
19455f091d
Change-Id: I476c6bce6daf352dfa1a6741345f642b3472fed1
Selim Cinek [Tue, 15 May 2018 17:20:19 +0000 (10:20 -0700)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev
am:
2cfd9fb99c
Change-Id: I3046b09b85a995491e616736cb9519c7ced3a944
jiabin [Tue, 3 Apr 2018 01:18:45 +0000 (18:18 -0700)]
Add support for manually set surround formats.
To make surround sound setting more clear to users, we are changing
surround setting from ALWAYS to MANUAL. With MANUAL, users could enable
surround formats according to their need.
Bug:
67479735
Test: Try creating AudioTrack with enable/disable surround formats.
Change-Id: I79e610f6c43d7003daf13da3bee4e03ba9b6ea87
Selim Cinek [Tue, 15 May 2018 17:10:18 +0000 (10:10 -0700)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev
am:
f81ad4b94c
Change-Id: I066038b167f71f4f649b609b68aec66891c97a24
Selim Cinek [Tue, 15 May 2018 17:07:56 +0000 (17:07 +0000)]
Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
Jason Monk [Tue, 15 May 2018 17:00:29 +0000 (10:00 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev am:
c46279aa98
am:
2af66fb30f
Change-Id: Ib5d396772eef78971a1c4750bebe72ba49fdaef2
Jason Monk [Tue, 15 May 2018 16:52:15 +0000 (09:52 -0700)]
Merge "Fix crash when loading resources without code" into pi-dev
am:
c46279aa98
Change-Id: I3af4a66f050380c507ec59b9136f2ef6a4f41848
Jason Monk [Tue, 15 May 2018 16:50:57 +0000 (12:50 -0400)]
Blacklist doze setting from tuner reset
Test: manual
Change-Id: I934cfcd65552c9998eb95ecfed65670ec73dde8d
Fixes:
78512759
Selim Cinek [Tue, 15 May 2018 16:47:44 +0000 (16:47 +0000)]
Merge "Keeping the header hidden while the hun is going away" into pi-dev
Selim Cinek [Tue, 15 May 2018 16:47:17 +0000 (16:47 +0000)]
Merge "Fixed that views could be stuck transiently at times" into pi-dev
TreeHugger Robot [Tue, 15 May 2018 16:33:20 +0000 (16:33 +0000)]
Merge "Fix crash when loading resources without code" into pi-dev
Selim Cinek [Tue, 15 May 2018 02:17:06 +0000 (19:17 -0700)]
Hiding all views when the notification shade is collapsed
Non-heads up views could still be visible when the shade
was collapsed. Therefore they would briefly peak out
after heads up views would be swiped away leading
to ugly flickering.
Test: add hun (with notch enabled) and swipe away hun with other views present
Change-Id: I794693d7d5af5591490df7c2f4b95c01043897d2
Fixes:
76150837
Jeff Sharkey [Tue, 15 May 2018 15:37:39 +0000 (08:37 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev am:
8e6445a1a5
am:
75299cffec
Change-Id: If07e77c92046807235229a4f67ee087bdd7bccf1
Jason Monk [Tue, 15 May 2018 15:30:09 +0000 (11:30 -0400)]
Fix crash when loading resources without code
Should use default appComponentFactory, not the actual one from the
app because we have no code.
Test: manual
Change-Id: I982967543c4cf5c28b19b36b6d183a30052bf602
Fixes:
78883500
Jeff Sharkey [Tue, 15 May 2018 15:27:40 +0000 (08:27 -0700)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev
am:
8e6445a1a5
Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Jeff Sharkey [Tue, 15 May 2018 15:17:30 +0000 (15:17 +0000)]
Merge "Let tests enumerate all transports/capabilities." into pi-dev
Nicolas Geoffray [Tue, 15 May 2018 15:15:19 +0000 (08:15 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev am:
a66cc0da75
am:
060d3525e6
Change-Id: Ib843668663d55d40007e1bfdf4979e8d3b5d1988
Nicolas Geoffray [Tue, 15 May 2018 15:07:29 +0000 (08:07 -0700)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
am:
a66cc0da75
Change-Id: Ia79917a4f798ad46cc98a187e1bca4bab10d098a
Nicolas Geoffray [Tue, 15 May 2018 14:59:04 +0000 (14:59 +0000)]
Merge "Add RemoteViews.setIsWidgetCollectionChild to light grey." into pi-dev
Chris Wren [Tue, 15 May 2018 14:32:39 +0000 (07:32 -0700)]
Merge "clean up comments" into pi-dev am:
b8dcc91eb9
am:
66f4f3e2f2
Change-Id: I95c718361fcb64fb67c84441abd0309aeb1d6a78
Chris Wren [Tue, 15 May 2018 14:24:55 +0000 (07:24 -0700)]
Merge "clean up comments" into pi-dev
am:
b8dcc91eb9
Change-Id: I9a29d924b1f00491d963e6bf93172b1b622a73a9
Chris Wren [Tue, 15 May 2018 14:15:09 +0000 (14:15 +0000)]
Merge "clean up comments" into pi-dev
Chris Wren [Mon, 14 May 2018 21:16:31 +0000 (17:16 -0400)]
clean up comments
Bug:
79698458
Test: make framework-protos
Change-Id: Ifaac050f2e00912188e3fb999b308101e3b07bf0
shawnlin [Tue, 15 May 2018 08:39:56 +0000 (16:39 +0800)]
Fixed notification shelf not fully visible on lockscreen
Remove the height limitation of mBackgroundBounds.bottom, and allow min
height of NSSL to be shelf size in keyguard when qs panel fully
expanded.
Test: runtest systemui
Change-Id: I74755f8eefa70beec32db2a66a7a425b7fff0276
Fixes:
79202907
Jiyong Park [Tue, 15 May 2018 07:18:23 +0000 (00:18 -0700)]
Merge "Add api txt files for nfc-extras" am:
be7959bb10 am:
06bbf7e675
am:
afb9dbba38
Change-Id: I1a804772d5443c6b2962c72d4cfd048ce21b5096
Jiyong Park [Tue, 15 May 2018 07:09:36 +0000 (00:09 -0700)]
Merge "Add api txt files for nfc-extras" am:
be7959bb10
am:
06bbf7e675
Change-Id: I7f883efb4343be29a4a6c300c59c32505199535c
Jiyong Park [Tue, 15 May 2018 06:57:56 +0000 (23:57 -0700)]
Merge "Add api txt files for nfc-extras"
am:
be7959bb10
Change-Id: Iea39dee06752e13bb659f5f31f555b089ca4b90d
Nathan Harold [Tue, 15 May 2018 06:14:14 +0000 (06:14 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"
Felipe Leme [Tue, 15 May 2018 06:09:16 +0000 (23:09 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev am:
6d0842154b
am:
aae288a6a5
Change-Id: I8f543b2e8066d8f54baf3bf846de585f8a7631da
Felipe Leme [Tue, 15 May 2018 06:01:10 +0000 (23:01 -0700)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
am:
6d0842154b
Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad
TreeHugger Robot [Tue, 15 May 2018 05:47:51 +0000 (05:47 +0000)]
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
Nathan Harold [Thu, 26 Apr 2018 18:47:14 +0000 (11:47 -0700)]
Use INetd Constant for IpSec Interface Prefix
Convert to using a constant in INetd to ensure
that there is a consistent tunnel prefix between
Java and native code.
Bug:
74560705
Test: atest FramworksNetTest; atest CtsNetTestCases
Change-Id: Ida233aac2e6c6b26567463964e0ebac9d52eff1e
(cherry picked from commit
649df5e07a968ac98b41a1da60a04d59149d2385)