OSDN Git Service
Geoffrey Pitsch [Tue, 30 May 2017 15:44:14 +0000 (15:44 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
am:
f6e956b1c6
Change-Id: I5a28910fa155a17256655ccd2cc0dc341dc3fbc3
Geoffrey Pitsch [Tue, 30 May 2017 15:38:59 +0000 (15:38 +0000)]
Merge "Reduce toast duration for channel warnings." into oc-dev
Erik Kline [Mon, 29 May 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48 am:
06e6033327
am:
ff8b93f815
Change-Id: I68ff0810e4109c52e1d594a4b75fc768570ef59d
Erik Kline [Mon, 29 May 2017 08:48:38 +0000 (08:48 +0000)]
Merge "Support "dumpsys connectivity tethering"" am:
6cdcba7b48
am:
06e6033327
Change-Id: Ib88b17502c344314cb81d9c0167c2610e55d8313
Erik Kline [Mon, 29 May 2017 08:42:04 +0000 (08:42 +0000)]
Merge "Support "dumpsys connectivity tethering""
am:
6cdcba7b48
Change-Id: I91ef704d3fda346a50016841f40fecce2e23d215
Erik Kline [Mon, 29 May 2017 08:33:09 +0000 (08:33 +0000)]
Merge "Support "dumpsys connectivity tethering""
Joel Scherpelz [Mon, 29 May 2017 03:51:25 +0000 (03:51 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4 am:
4971745cf4
am:
880974f111
Change-Id: I98aa768cf47938aa0996ddabbbc9feb9dae96f1e
Joel Scherpelz [Mon, 29 May 2017 03:41:23 +0000 (03:41 +0000)]
Merge "Support requesting and receiving wakeup events" am:
bf152b14c4
am:
4971745cf4
Change-Id: I1212c64e90572b7f45ca106c36ea89f37fb086ae
Joel Scherpelz [Mon, 29 May 2017 03:33:08 +0000 (03:33 +0000)]
Merge "Support requesting and receiving wakeup events"
am:
bf152b14c4
Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553
Joel Scherpelz [Mon, 29 May 2017 03:28:00 +0000 (03:28 +0000)]
Merge "Support requesting and receiving wakeup events"
Erik Kline [Mon, 29 May 2017 00:11:03 +0000 (09:11 +0900)]
Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.
Test: as follows
- build
- flashed
- booted
- runtest frameworks-net passes
- "dumpsys connectivity tethering" shows just tethering info
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
Joel Scherpelz [Mon, 22 May 2017 04:47:41 +0000 (13:47 +0900)]
Support requesting and receiving wakeup events
Test: as follows
- built
- flashed
- booted
- ConnectivityServiceTest passes
Bug:
28806131
Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
Erik Kline [Sun, 28 May 2017 11:31:32 +0000 (11:31 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b am:
8211c36db9
am:
1315903420
Change-Id: I77b4db07f2a43a576146537ae2ab72d2d0ebdde6
Erik Kline [Sun, 28 May 2017 11:25:29 +0000 (11:25 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration" am:
39ce589f0b
am:
8211c36db9
Change-Id: Icf1f42b76998a3c7f4fd4285beb89e1310e5413d
Erik Kline [Sun, 28 May 2017 11:16:32 +0000 (11:16 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
am:
39ce589f0b
Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
Erik Kline [Sun, 28 May 2017 11:06:39 +0000 (11:06 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
Erik Kline [Fri, 19 May 2017 01:10:41 +0000 (10:10 +0900)]
Minor improvement in logging in TetheringConfiguration
Test: as follows
- built
- booted
- flashed
- runtest frameworks-net passes
- dumpsys connectivity shows expected output
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
Felipe Leme [Sat, 27 May 2017 02:30:30 +0000 (02:30 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
am:
0b1b1c4346
Change-Id: I2aeaefde853f941263fcf677dfdcb3bffc6ab337
TreeHugger Robot [Sat, 27 May 2017 02:25:02 +0000 (02:25 +0000)]
Merge "Improved autofillHints documentation." into oc-dev
Adam Lesinski [Sat, 27 May 2017 01:51:55 +0000 (01:51 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
am:
6ea61f9c6d
Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de
TreeHugger Robot [Sat, 27 May 2017 01:43:46 +0000 (01:43 +0000)]
Merge "AAPT2: Follow symlinks when compiling" into oc-dev
Android Build Merger (Role) [Sat, 27 May 2017 01:35:54 +0000 (01:35 +0000)]
Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am:
9c4b6d3bff" into oc-dev-plus-aosp
Matthew Ng [Sat, 27 May 2017 01:35:13 +0000 (01:35 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
am:
9c4b6d3bff
Change-Id: I9ce71c3f2434ef98d91161353c358e65c336e3bc
Android Build Merger (Role) [Sat, 27 May 2017 01:34:51 +0000 (01:34 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." into oc-dev am:
e2b92e904c" into oc-dev-plus-aosp
Jakub Pawlowski [Sat, 27 May 2017 01:33:59 +0000 (01:33 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
am:
e2b92e904c
Change-Id: Iabcac8a4597e2913d461cafa179a8a79ce0e48d9
Hall Liu [Sat, 27 May 2017 01:31:58 +0000 (01:31 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3 am:
20d98578f2
am:
aac7e3a182
Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
TreeHugger Robot [Sat, 27 May 2017 01:29:41 +0000 (01:29 +0000)]
Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." into oc-dev
Hall Liu [Sat, 27 May 2017 01:25:28 +0000 (01:25 +0000)]
Merge "Add new error codes in MbmsException" am:
8e7057ccf3
am:
20d98578f2
Change-Id: If10d6d2df336be4e52a5b0c4d1bab6455de0f1ce
Hall Liu [Sat, 27 May 2017 01:18:33 +0000 (01:18 +0000)]
Merge "Add new error codes in MbmsException"
am:
8e7057ccf3
Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Siyamed Sinir [Sat, 27 May 2017 00:27:58 +0000 (00:27 +0000)]
Merge "Dont try to autoSize if TextView is not measured" into oc-dev
am:
42b2760525
Change-Id: I737e9498b08de1a8447db39b194fe1640c721f2d
Jiaquan He [Sat, 27 May 2017 00:20:56 +0000 (00:20 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
am:
759669988b
Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c
Jiaquan He [Sat, 27 May 2017 00:19:35 +0000 (00:19 +0000)]
Check state_focus in foreground.
am:
0bdf1c9c76
Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
Siyamed Sinir [Sat, 27 May 2017 00:13:33 +0000 (00:13 +0000)]
Merge "Don’t try to autoSize if TextView is not measured" into oc-dev
TreeHugger Robot [Sat, 27 May 2017 00:11:01 +0000 (00:11 +0000)]
Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
Check default focus highlight for ImageView.
Check state_focus in foreground.
Adam Lesinski [Fri, 26 May 2017 23:31:38 +0000 (16:31 -0700)]
AAPT2: Follow symlinks when compiling
Bug:
62144459
Test: make AaptSymlinkTest
Change-Id: Idb3ab1ece17c52bb4fd174ec4c08a9e173289e55
Selim Cinek [Fri, 26 May 2017 23:38:48 +0000 (23:38 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am:
7ddf54211f
Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068
Selim Cinek [Fri, 26 May 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
Andrii Kulian [Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am:
e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
(cherry picked from commit
45033a7e5799f2d957c7dad22eec0bfef94b3e16)
Android Build Merger (Role) [Fri, 26 May 2017 23:22:11 +0000 (23:22 +0000)]
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp am:
658e1ddc7e" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 26 May 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp
am:
658e1ddc7e
Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6
Jiaquan He [Fri, 26 May 2017 23:19:16 +0000 (23:19 +0000)]
Merge "Fix the back button ripple." into oc-dev
am:
a7914f24dd
Change-Id: I35e474ed44380821278009945529474b6251c23b
Android Build Merger (Role) [Fri, 26 May 2017 23:17:28 +0000 (23:17 +0000)]
Merge "Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd" into nyc-mr2-dev-plus-aosp
Jakub Pawlowski [Fri, 26 May 2017 23:16:35 +0000 (23:16 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3
am:
2acc8e28dd
Change-Id: I3fe5c7c0baf273c9960a56640cd659abd990b858
Andrii Kulian [Fri, 26 May 2017 23:15:14 +0000 (23:15 +0000)]
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
Jakub Pawlowski [Fri, 26 May 2017 23:14:27 +0000 (23:14 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3 am:
2acc8e28dd
am:
138f75bbc8
Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa
TreeHugger Robot [Fri, 26 May 2017 23:10:44 +0000 (23:10 +0000)]
Merge "Fix the back button ripple." into oc-dev
Jakub Pawlowski [Fri, 26 May 2017 23:09:23 +0000 (23:09 +0000)]
Merge "Add 32 and 128 bit Service Data parsing." am:
725e212de3
am:
2acc8e28dd
Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28
Jakub Pawlowski [Fri, 26 May 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
am:
725e212de3
Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
Yuka Anami [Fri, 26 May 2017 22:58:49 +0000 (22:58 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
am:
bb63b4a376
Change-Id: I923cb6ed3b459f092a24211f7e18076d248ae615
Treehugger Robot [Fri, 26 May 2017 22:53:27 +0000 (22:53 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
TreeHugger Robot [Fri, 26 May 2017 22:51:55 +0000 (22:51 +0000)]
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
Hall Liu [Fri, 26 May 2017 22:49:32 +0000 (15:49 -0700)]
Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
Ruchi Kandoi [Fri, 26 May 2017 22:45:24 +0000 (22:45 +0000)]
Merge "Make NFC AIDL callbacks oneway" am:
99c805b319 am:
a50b393781
am:
3377e1fc91
Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359
Ruchi Kandoi [Fri, 26 May 2017 22:37:26 +0000 (22:37 +0000)]
Merge "Make NFC AIDL callbacks oneway" am:
99c805b319
am:
a50b393781
Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6
Yuka Anami [Fri, 26 May 2017 22:30:19 +0000 (22:30 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am:
b1f0bb6f83 am:
0d9dfc4314
am:
269cb38bb9
Change-Id: I8bf7940e14a0f2177ff46ef91575922b48716351
Ruchi Kandoi [Fri, 26 May 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Make NFC AIDL callbacks oneway"
am:
99c805b319
Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189
Yuka Anami [Fri, 26 May 2017 22:23:53 +0000 (22:23 +0000)]
Merge "Add ID_LENGTH field for Empty type record" am:
b1f0bb6f83
am:
0d9dfc4314
Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"
Yuka Anami [Fri, 26 May 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
am:
b1f0bb6f83
Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59
Sergey Vasilinets [Fri, 26 May 2017 22:16:00 +0000 (22:16 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
am:
bacaffa497
Change-Id: I7306408f2de87edc16d091713eba777a8e58b0ac
Sergey Vasilinets [Fri, 26 May 2017 22:11:22 +0000 (22:11 +0000)]
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
Treehugger Robot [Fri, 26 May 2017 22:07:37 +0000 (22:07 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
Julius D'souza [Fri, 26 May 2017 22:05:44 +0000 (22:05 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
am:
f4abac4d8f -s ours
Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0
Julius D'souza [Fri, 26 May 2017 22:00:41 +0000 (22:00 +0000)]
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission.
am:
b9a71dfd38 -s ours
Change-Id: I9070e593929924f3feae92e08980549ba755036b
Julia Reynolds [Fri, 26 May 2017 21:52:17 +0000 (21:52 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev
am:
2c324042df
Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c
TreeHugger Robot [Fri, 26 May 2017 21:48:48 +0000 (21:48 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 21:43:24 +0000 (21:43 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev
Felipe Leme [Fri, 26 May 2017 21:35:41 +0000 (21:35 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev
am:
3540463b74
Change-Id: I0a95d3c79a16240d00a8684341d00c9b76927fbf
Jiaquan He [Mon, 1 May 2017 21:18:39 +0000 (14:18 -0700)]
Check default focus highlight for ImageView.
This commit specially checks isDefaultFocusHighlightNeeded for
ImageView. We should also check with the content drawable of the
ImageView besides its foreground or background.
Bug:
62141891
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded
Change-Id: Iaf12a5863d7760d9361d0196a46de07a9ccda74e
TreeHugger Robot [Fri, 26 May 2017 21:29:41 +0000 (21:29 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev
Jiaquan He [Wed, 24 May 2017 23:00:10 +0000 (16:00 -0700)]
Fix the back button ripple.
Bug:
62141426
Test: Manually checked that the default highlight doesn't show up
when tapping on the back button on the navigation bar.
Change-Id: Iedef32077c869e55f14dbd0aa92c4ce3220e0d1a
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
Amith Yamasani [Fri, 26 May 2017 21:10:40 +0000 (21:10 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
am:
22c2be0fbc
Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d
Ruchi Kandoi [Fri, 28 Apr 2017 22:48:02 +0000 (15:48 -0700)]
Make NFC AIDL callbacks oneway
Test: Read NFC tags, Android Beam
Bug:
32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Alan Viverette [Fri, 26 May 2017 21:03:07 +0000 (21:03 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev
am:
bd8fb0e71d
Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21
TreeHugger Robot [Fri, 26 May 2017 20:56:05 +0000 (20:56 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 20:54:49 +0000 (20:54 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
Add ID_LENGTH field for Empty type record
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by
e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug:
38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
(cherry picked from commit
ef9d0a480ef72a4ff0de5b5afa3661cff81fd8b5)
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
Add ID_LENGTH field for Empty type record
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by
e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug:
38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
Jason Monk [Fri, 26 May 2017 20:52:10 +0000 (20:52 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev
am:
b25f52c042
Change-Id: I7ec755fdfda3014aecdcfa7ff47ae0c39d3bff92
Jason Monk [Fri, 26 May 2017 20:44:10 +0000 (20:44 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev
Julia Reynolds [Fri, 26 May 2017 18:43:47 +0000 (14:43 -0400)]
Properly read vibration setting on boot.
Test: runtest systemui-notification
Change-Id: I400bc3df441524abe4973d4d6bccc7ef30a2e1c7
Fixes:
37865035
Selim Cinek [Fri, 26 May 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
am:
76926df97e
Change-Id: I7183050c98b5f1eb9f8a8a7dbfe4b7b75a1c3be7
Selim Cinek [Fri, 26 May 2017 19:45:00 +0000 (19:45 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
Jason Monk [Fri, 26 May 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev
am:
1ec5d85a41
Change-Id: I9b2e6dbe789bb6e1ff113e5ad015813e1062c6b4
Felipe Leme [Fri, 26 May 2017 19:06:25 +0000 (19:06 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
am:
7990306b8b
Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8
Jason Monk [Fri, 26 May 2017 19:03:39 +0000 (19:03 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev
Siyamed Sinir [Fri, 26 May 2017 02:37:06 +0000 (19:37 -0700)]
Don’t try to autoSize if TextView is not measured
This CL early returns from auto sizing text if the view is not measured
yet.
Test: run cts --test android.widget.cts.TextViewTest -m CtsWidgetTestCases
Test: Added cts.TextViewTest#testAutosizeWithMaxLines_shouldNotThrowException
Test: Manual test with sample app for the failing case.
Bug:
38440435
Change-Id: Ic03c991f33a2b7701623f00f44cba7fb6cdfce46
Alan Viverette [Tue, 23 May 2017 15:33:42 +0000 (11:33 -0400)]
Resolve inflate attr against default package
Change-Id: I2de0f79fb4918770c9f816934b1fc4953073a4f1
Fixes:
38456890
Test: LayoutInflaterTest#testInclude
TreeHugger Robot [Fri, 26 May 2017 18:55:32 +0000 (18:55 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:55:15 +0000 (18:55 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev
am:
24c18af14a
Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294
Adam Lesinski [Fri, 26 May 2017 18:49:11 +0000 (18:49 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
am:
e229113d46
Change-Id: I0200771f675cdfa69c458c374d3c16b0d91c5756
Adam Lesinski [Fri, 26 May 2017 18:45:24 +0000 (18:45 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:42:43 +0000 (18:42 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
Steven Moreland [Fri, 26 May 2017 18:38:09 +0000 (18:38 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev
am:
579110398d -s ours
Change-Id: I60e19c0d9328bea5e69517e91b47a56e53758ad1
Steven Moreland [Fri, 26 May 2017 18:31:53 +0000 (18:31 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev
Felipe Leme [Fri, 26 May 2017 16:24:33 +0000 (09:24 -0700)]
Disable autofill while user setup is not completed.
Test: manual verification with experimental app
Test: manual verification with Autofill with Google on flashed deviced
Test: existing CtsAutoFillServiceTestCases pass
Test: new LoginActivityTest.testSetupComplete pass
Fixes:
62049772
Change-Id: I1e914c44062755f8c88656482338e76aeaafd543
OSDN Git Service
